From 23fc24278c979c3a814747ffaaeabf8a21a4b5c2 Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Wed, 18 Nov 2015 21:33:03 +0000 Subject: [PATCH] Eliminate a db query when building the admin menu for non-privileged users. Users who cannot `edit_posts` do not see the Comments nav item anyway, so don't bother running a query that gets a comment count to display in the menu. Props bordoni, johnbillion. Fixes #19372. git-svn-id: https://develop.svn.wordpress.org/trunk@35691 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/menu.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/menu.php b/src/wp-admin/menu.php index d04fd3c12f..64f80190cf 100644 --- a/src/wp-admin/menu.php +++ b/src/wp-admin/menu.php @@ -67,10 +67,21 @@ $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-to // $menu[20] = Pages -$awaiting_mod = wp_count_comments(); -$awaiting_mod = $awaiting_mod->moderated; -$menu[25] = array( sprintf( __('Comments %s'), "" . number_format_i18n($awaiting_mod) . "" ), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'dashicons-admin-comments' ); -unset($awaiting_mod); +// Avoid the comment count query for users who cannot edit_posts. +if ( current_user_can( 'edit_posts' ) ) { + $awaiting_mod = wp_count_comments(); + $awaiting_mod = $awaiting_mod->moderated; + $menu[25] = array( + sprintf( __( 'Comments %s' ), '' . number_format_i18n( $awaiting_mod ) . '' ), + 'edit_posts', + 'edit-comments.php', + '', + 'menu-top menu-icon-comments', + 'menu-comments', + 'dashicons-admin-comments', + ); + unset( $awaiting_mod ); +} $submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );