Changes in trunk/wp-admin/menu-header.php [17950:15866]

File:

• trunk/wp-admin/menu-header.php (modified) (9 diffs)

trunk/wp-admin/menu-header.php

@@ -37 +37 @@
     global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow;
 
-    $menu_setting_increment = -1;
-    $user_settings = get_all_user_settings();
-
     $first = true;
     // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
@@ -49 +46 @@
             $first = false;
         }
-        if ( !empty($submenu[$item[2]]) ) {
+        if ( !empty($submenu[$item[2]]) )
             $class[] = 'wp-has-submenu';
-            $menu_setting_increment++;
-        }
 
         if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
@@ -59 +54 @@
             else
                 $class[] = 'current';
-        } elseif ( ! empty( $submenu[ $item[2] ] ) && isset( $user_settings[ 'm' . $menu_setting_increment ] ) && 'o' == $user_settings[ 'm' . $menu_setting_increment ] ) {
-                $class[] = 'wp-menu-open';
         }
 
@@ -77 +70 @@
         }
         $toggle = '<div class="wp-menu-toggle"><br /></div>';
-        $arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
         $title = wptexturize($item[0]);
@@ -83 +75 @@
         echo "\n\t<li$class$id>";
 
-        if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
-            echo '<div class="separator"></div>';
+        if ( false !== strpos($class, 'wp-menu-separator') ) {
+            echo '<a class="separator" href="?unfoldmenu=1"><br /></a>';
         } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
             $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
@@ -93 +85 @@
             if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) {
                 $admin_is_parent = true;
-                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$arrow$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
+                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
             } else {
-                echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$arrow$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
+                echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
             }
-        } else if ( !empty($item[2]) && current_user_can($item[1]) ) {
+        } else if ( current_user_can($item[1]) ) {
             $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
             $menu_file = $item[2];
@@ -104 +96 @@
             if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) {
                 $admin_is_parent = true;
-                echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
+                echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
             } else {
-                echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
+                echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
             }
         }
 
         if ( !empty($submenu[$item[2]]) ) {
-            echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
-            echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
+            echo "\n\t<div class='wp-submenu'><div class='wp-submenu-head'>{$item[0]}</div><ul>";
             $first = true;
             foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
@@ -165 +156 @@
                 }
             }
-            echo "</ul></div></div>";
+            echo "</ul></div>";
         }
         echo "</li>";
     }
-
-    echo '<li id="collapse-menu"><div id="collapse-button"><div></div></div>';
-    echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>';
-    echo '</li>';
 }
 
 ?>
 
-<div id="adminmenuback"></div>
-<div id="adminmenuwrap">
-<div id="adminmenushadow"></div>
 <ul id="adminmenu">
 
@@ -189 +173 @@
 ?>
 </ul>
-</div>