Changeset 17943

Timestamp:

05/17/2011 06:19:00 AM (15 years ago)

Author:

azaozz

Message:

Remove links from the menu separators, see #17324

Location:

trunk/wp-admin

Files:

• menu-header.php (modified) (2 diffs)
• menu.php (modified) (3 diffs)

trunk/wp-admin/menu-header.php

@@ -83 +83 @@
         echo "\n\t<li$class$id>";
 
-        if ( false !== strpos($class, 'wp-menu-separator') ) {
-            echo '<a class="separator" href="?unfoldmenu=1"><br /></a>';
-        } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
+        if ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
             $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
             $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
@@ -97 +95 @@
                 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>";
             }
-        } else if ( current_user_can($item[1]) ) {
+        } else if ( !empty($item[2]) && current_user_can($item[1]) ) {
             $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
             $menu_file = $item[2];

trunk/wp-admin/menu.php

@@ -70 +70 @@
 unset($theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
 
-$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
+$menu[4] = array( '', 'read', '', '', 'wp-menu-separator' );
 
 $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
@@ -153 +153 @@
 unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
 
-$menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
+$menu[59] = array( '', 'read', '', '', 'wp-menu-separator' );
 
 if ( current_user_can( 'switch_themes') ) {
@@ -233 +233 @@
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
 
-$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
+$menu[99] = array( '', 'read', '', '', 'wp-menu-separator-last' );
 
 // Back-compat for old top-levels