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
git-svn-id: http://svn.automattic.com/wordpress/trunk@18844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
f1a1d07a13
commit
cd0c3f605e
|
@ -366,7 +366,7 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
|
||||||
* @since 3.1.0
|
* @since 3.1.0
|
||||||
*/
|
*/
|
||||||
function wp_admin_bar_edit_menu( $wp_admin_bar ) {
|
function wp_admin_bar_edit_menu( $wp_admin_bar ) {
|
||||||
global $post, $tag;
|
global $post, $tag, $wp_the_query;
|
||||||
|
|
||||||
if ( is_admin() ) {
|
if ( is_admin() ) {
|
||||||
$current_screen = get_current_screen();
|
$current_screen = get_current_screen();
|
||||||
|
@ -394,9 +394,9 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
|
||||||
) );
|
) );
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$current_object = get_queried_object();
|
$current_object = $wp_the_query->get_queried_object();
|
||||||
|
|
||||||
if ( empty($current_object) )
|
if ( empty( $current_object ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if ( ! empty( $current_object->post_type )
|
if ( ! empty( $current_object->post_type )
|
||||||
|
|
Loading…
Reference in New Issue