WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If there is only one submenu and it is has same destination as the parent, remove the submenu. fixes #17528 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-05-25 16:05:52 +00:00
parent dd538986fa
commit ae8f4a2a80
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/includes/menu.php
View File

@ -102,6 +102,15 @@ foreach ( $menu as $id => $data ) {
if ( ! current_user_can($data[1]) ) if ( ! current_user_can($data[1]) )
$_wp_menu_nopriv[$data[2]] = true; $_wp_menu_nopriv[$data[2]] = true;
// If there is only one submenu and it is has same destination as the parent,
// remove the submenu.
if ( 1 == count ( $submenu[$data[2]] ) ) {
$subs = $submenu[$data[2]];
$first_sub = array_shift($subs);
if ( $data[2] == $first_sub[2] )
unset( $submenu[$data[2]] );
}
// 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.
@ -110,7 +119,7 @@ foreach ( $menu as $id => $data ) {
} }
} }
} }
unset($id, $data); unset($id, $data, $subs, $first_sub);
// Remove any duplicated seperators // Remove any duplicated seperators
$seperator_found = false; $seperator_found = false;