Changeset 18844 for trunk/wp-includes/admin-bar.php

Timestamp:

09/30/2011 06:07:14 PM (14 years ago)

Author:

ryan

Message:

Consult the main query when determining whether to show the edit menu in the admin bar. This insulates the admin bar from query_posts() queries made by themes and plugins. Props SergeyBiryukov. fixes #16798

File:

• trunk/wp-includes/admin-bar.php (modified) (2 diffs)

trunk/wp-includes/admin-bar.php

@@ -367 +367 @@
  */
 function wp_admin_bar_edit_menu( $wp_admin_bar ) {
-    global $post, $tag;
+    global $post, $tag, $wp_the_query;
 
     if ( is_admin() ) {
@@ -395 +395 @@
         }
     } else {
-        $current_object = get_queried_object();
-
-        if ( empty($current_object) )
+        $current_object = $wp_the_query->get_queried_object();
+
+        if ( empty( $current_object ) )
             return;