Changes from trunk/wp-admin/menu-header.php at r11118 to branches/2.8/wp-admin/menu-header.php at r11583

File:

• branches/2.8/wp-admin/menu-header.php (modified) (5 diffs)

branches/2.8/wp-admin/menu-header.php

@@ -75 +75 @@
             $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
             $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-            if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") ) || !empty($menu_hook)) {
+            $menu_file = $submenu[$item[2]][0][2];
+            if ( false !== $pos = strpos($menu_file, '?') )
+                $menu_file = substr($menu_file, 0, $pos);
+            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>$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
@@ -83 +86 @@
         } else if ( current_user_can($item[1]) ) {
             $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
-            if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) ) {
+            $menu_file = $item[2];
+            if ( false !== $pos = strpos($menu_file, '?') )
+                $menu_file = substr($menu_file, 0, $pos);
+            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>$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
@@ -103 +109 @@
                     $first = false;
                 }
+
+                $menu_file = $item[2];
+                if ( false !== $pos = strpos($menu_file, '?') )
+                    $menu_file = substr($menu_file, 0, $pos);
+
                 if ( isset($submenu_file) ) {
                     if ( $submenu_file == $sub_item[2] )
@@ -108 +119 @@
                 // If plugin_page is set the parent must either match the current page or not physically exist.
                 // This allows plugin pages with the same hook to exist under different parents.
-                } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($item[2]) || ($item[2] == $self))) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
+                } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($menu_file) || ($item[2] == $self))) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
                     $class[] = 'current';
                 }
@@ -115 +126 @@
 
                 $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
+                $sub_file = $sub_item[2];
+                if ( false !== $pos = strpos($sub_file, '?') )
+                    $sub_file = substr($sub_file, 0, $pos);
 
-                if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") ) || ! empty($menu_hook) ) {
+                if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
                     // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-                    $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/{$item[2]}") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($item[2]);
+                    
+                    $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($menu_file);
                     if ( $parent_exists )
                         echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";