Wordpress 3.1.2-scripts

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

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 2a9ee7294c266c9098482bcd96c5a8a8a5243fae..dfa1ccbba596d620f986c156a47f2ffa5de59550 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -13,7 +13,8 @@
  * @name $self
  * @var string
  */
  * @name $self
  * @var string
  */

-$self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/|i', '', $self);

 $self = preg_replace('|^.*/plugins/|i', '', $self);
 $self = preg_replace('|^.*/mu-plugins/|i', '', $self);
 
 $self = preg_replace('|^.*/plugins/|i', '', $self);
 $self = preg_replace('|^.*/mu-plugins/|i', '', $self);
 


@@ -47,7 +48,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                if ( !empty($submenu[$item[2]]) )
                        $class[] = 'wp-has-submenu';
 
                if ( !empty($submenu[$item[2]]) )
                        $class[] = 'wp-has-submenu';
 

-               if ( ( $parent_file && $item[2] == $parent_file ) || ( false === strpos($parent_file, '?') && $self == $item[2] ) ) {
+               if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {

                        if ( !empty($submenu[$item[2]]) )
                                $class[] = 'wp-has-current-submenu wp-menu-open';
                        else
                        if ( !empty($submenu[$item[2]]) )
                                $class[] = 'wp-has-current-submenu wp-menu-open';
                        else