Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

After [34444​], `wp_get_shortlink()` can call `get_queried_object_id()` instead of using the `$wp_query` global. 

See #14900.

Built from https://develop.svn.wordpress.org/trunk@34445


git-svn-id: http://core.svn.wordpress.org/trunk@34409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-22 20:09:23 +00:00
parent 7cbd096c2b
commit d866a40d09
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/link-template.php
View File

@ -3471,8 +3471,6 @@ function rel_canonical() {
*
* @since 3.0.0.
*
* @global WP_Query $wp_query
*
* @param int $id A post or blog id. Default is 0, which means the current post or blog.
* @param string $context Whether the id is a 'blog' id, 'post' id, or 'media' id.
* If 'post', the post_type of the post is consulted.
@ -3497,13 +3495,13 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
*/
$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
if ( false !== $shortlink )
if ( false !== $shortlink ) {
return $shortlink;
}
global $wp_query;
$post_id = 0;
if ( 'query' == $context && is_singular() ) {
$post_id = $wp_query->get_queried_object_id();
$post_id = get_queried_object_id();
$post = get_post( $post_id );
} elseif ( 'post' == $context ) {
$post = get_post( $id );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-34444';
$wp_version = '4.4-alpha-34445';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.