golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that inaccessible parent menus are marked as such even if they have accessible children. See #11922. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-01-16 22:59:27 +00:00
parent c2873bbab3
commit 795ce48b83
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/menu.php
View File

@ -246,11 +246,13 @@ do_action('admin_menu', '');
// Remove menus that have no accessible submenus and require privs that the user does not have. // Remove menus that have no accessible submenus and require privs that the user does not have.
// Run re-parent loop again. // Run re-parent loop again.
foreach ( $menu as $id => $data ) { foreach ( $menu as $id => $data ) {
if ( ! current_user_can($data[1]) )
$_wp_menu_nopriv[$data[2]] = true;
// If submenu is empty... // If submenu is empty...
if ( empty($submenu[$data[2]]) ) { if ( empty($submenu[$data[2]]) ) {
// And user doesn't have privs, remove menu. // And user doesn't have privs, remove menu.
if ( ! current_user_can($data[1]) ) { if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
$_wp_menu_nopriv[$data[2]] = true;
unset($menu[$id]); unset($menu[$id]);
} }
} }