Changeset 34445

Timestamp:

09/22/2015 08:08:49 PM (9 years ago)

Author:

wonderboymusic

Message:

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

See #14900.

File:

• trunk/src/wp-includes/link-template.php (modified) (2 diffs)

trunk/src/wp-includes/link-template.php

@@ -3472 +3472 @@
  * @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.
@@ -3498 +3496 @@
     $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 ) {