WordPress 3.7-scripts

[autoinstalls/wordpress.git] / wp-admin / menu-header.php

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 25ebaa00fa8db9fdf40613c6aa51612863110f26..10ad1395ecf8f6704c34cabe267edb7302c6492b 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -34,7 +34,7 @@ get_admin_page_parent();
  * @param bool $submenu_as_parent
  */
 function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
-       global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow;
+       global $self, $parent_file, $submenu_file, $plugin_page, $typenow;
 
        $first = true;
        // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
@@ -75,7 +75,6 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                $arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
                $title = wptexturize( $item[0] );
-               $aria_label = esc_attr( strip_tags( $item[0] ) ); // strip the comment/plugins/updates bubbles spans but keep the pending number if any
 
                echo "\n\t<li$class$id>";
 
@@ -87,7 +86,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                        $menu_file = $submenu_items[0][2];
                        if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
                                $menu_file = substr( $menu_file, 0, $pos );
-                       if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
+                       if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
                                $admin_is_parent = true;
                                echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";
                        } else {
@@ -98,7 +97,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                        $menu_file = $item[2];
                        if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
                                $menu_file = substr( $menu_file, 0, $pos );
-                       if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
+                       if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
                                $admin_is_parent = true;
                                echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
                        } else {
@@ -150,12 +149,12 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
                                $title = wptexturize($sub_item[0]);
 
-                               if ( ! empty( $menu_hook ) || ( ('index.php' != $sub_item[2]) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) ) ) {
+                               if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
                                        // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-                                       if ( (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}")) || file_exists($menu_file) )
-                                               $sub_item_url = add_query_arg( array('page' => $sub_item[2]), $item[2] );
+                                       if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
+                                               $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
                                        else
-                                               $sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
+                                               $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
 
                                        $sub_item_url = esc_url( $sub_item_url );
                                        echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";