Ticket #17852: 17852.diff

wp-admin/menu-header.php

@@ -86 +86 @@
                                 $menu_file = substr( $menu_file, 0, $pos );
                         if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
                                 $admin_is_parent = true;
-                                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
+                                $menu_link = 'admin.php?page=' . $submenu_items[0][2];
                         } else {
-                                echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
+                                $menu_link = $submenu_items[0][2];
                         }
+                        echo "<div class='wp-menu-image'><a href='$menu_link'>$img</a></div>$arrow<a href='$menu_link'$class $aria_attributes>$title</a>";
                 } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
                         $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
                         $menu_file = $item[2];
@@ -97 +98 @@
                                 $menu_file = substr( $menu_file, 0, $pos );
                         if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
                                 $admin_is_parent = true;
-                                echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class $aria_attributes>{$item[0]}</a>";
+                                $menu_link = 'admin.php?page=' . $item[2];
                         } else {
-                                echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow<a href='{$item[2]}'$class $aria_attributes>{$item[0]}</a>";
+                                $menu_link = $item[2];
                         }
+                        echo "\n\t<div class='wp-menu-image'><a href='$menu_link'>$img</a></div>$arrow<a href='$menu_link'$class $aria_attributes>{$item[0]}</a>";
                 }
 
                 if ( ! empty( $submenu_items ) ) {
                         echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
-                        echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
+                        echo "<div class='wp-submenu-head'><a href='$menu_link'>{$item[0]}</a></div><ul>";
                         $first = true;
                         foreach ( $submenu_items as $sub_key => $sub_item ) {
                                 if ( ! current_user_can( $sub_item[1] ) )

wp-admin/css/wp-admin.dev.css

@@ -1689 +1689 @@
         padding: 0;
 }
 
-#adminmenu .wp-submenu a {
+#adminmenu .wp-submenu ul a {
         font-size: 12px;
         line-height: 18px;
 }
@@ -1730 +1730 @@
         cursor: pointer;
 }
 
-#adminmenu a {
+#adminmenu ul a {
         display: block;
         line-height: 18px;
         padding: 2px 5px;
@@ -1759 +1759 @@
         padding: 4px 0;
 }
 
-#adminmenu .wp-submenu a {
+#adminmenu .wp-submenu ul a {
         margin: 0;
 }
 
@@ -1767 +1767 @@
         margin-left: 8px;
 }
 
-#adminmenu .wp-submenu a,
+#adminmenu .wp-submenu ul a,
 #adminmenu li li a,
 .folded #adminmenu .wp-not-current-submenu li a {
         padding-left: 12px;
@@ -1951 +1951 @@
         border-style: solid;
 }
 
-.folded #adminmenu .wp-submenu a {
+.folded #adminmenu .wp-submenu ul a {
         padding-left: 10px;
 }
 

wp-admin/css/colors-classic.dev.css

@@ -418 +418 @@
 
 #adminmenu a:hover,
 #adminmenu li.menu-top > a:focus,
-#adminmenu ul.wp-submenu a:hover,
 #the-comment-list .comment a:hover,
 #rightnow a:hover,
 #media-upload a.del-link:hover,
@@ -1341 +1340 @@
         border-bottom-color: #5589AA;
 }
 
-#adminmenu .wp-submenu a:hover,
-#adminmenu .wp-submenu a:focus {
+#adminmenu .wp-submenu ul a:hover,
+#adminmenu .wp-submenu ul a:focus {
         background-color: #EFF8FF;
         color: #333;
 }

wp-admin/css/colors-fresh.dev.css

@@ -426 +426 @@
 
 #adminmenu a:hover,
 #adminmenu li.menu-top > a:focus,
-#adminmenu ul.wp-submenu a:hover,
 #the-comment-list .comment a:hover,
 #rightnow a:hover,
 #media-upload a.del-link:hover,
@@ -1033 +1032 @@
         border-bottom-color: #6d6d6d;
 }
 
-#adminmenu .wp-submenu a:hover,
-#adminmenu .wp-submenu a:focus {
+#adminmenu .wp-submenu ul a:hover,
+#adminmenu .wp-submenu ul a:focus {
         background-color: #EAF2FA;
         color: #333;
 }