Changeset 23656 for trunk/wp-admin/menu-header.php

Timestamp:

03/09/2013 02:48:49 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Prevent plugins with certain filenames from breaking links in the admin menu. props lightningspirit. fixes #22079.

File:

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

trunk/wp-admin/menu-header.php

@@ -88 +88 @@
             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>";
@@ -99 +99 @@
             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>";
@@ -151 +151 @@
                 $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 );