Changes in trunk/wp-admin/includes/menu.php [16471:18109]

File:

• trunk/wp-admin/includes/menu.php (modified) (3 diffs)

trunk/wp-admin/includes/menu.php

@@ -103 +103 @@
         $_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 ( ! empty( $submenu[$data[2]] ) && 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 ( empty($submenu[$data[2]]) ) {
@@ -111 +120 @@
     }
 }
-unset($id, $data);
-
-// Remove any duplicated seperators
-$seperator_found = false;
+unset($id, $data, $subs, $first_sub);
+
+// Remove any duplicated separators
+$separator_found = false;
 foreach ( $menu as $id => $data ) {
     if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) {
-        if (false == $seperator_found) {
-            $seperator_found = true;
+        if (false == $separator_found) {
+            $separator_found = true;
         } else {
             unset($menu[$id]);
-            $seperator_found = false;
+            $separator_found = false;
         }
     } else {
-        $seperator_found = false;
+        $separator_found = false;
     }
 }
@@ -206 +215 @@
 }
 
+// Remove the last menu item if it is a separator.
+$last_menu_key = array_pop( array_keys( $menu ) );
+if ( 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
+    unset( $menu[ $last_menu_key ] );
+unset( $last_menu_key );
+
 if ( !user_can_access_admin_page() ) {
     do_action('admin_page_access_denied');