Changeset 31105 for trunk/src/wp-admin/menu-header.php

Timestamp:

01/08/2015 10:14:58 PM (10 years ago)

Author:

wonderboymusic

Message:

Properly declare $hook_suffix, $plugin_page, $typenow, and $taxnow as globals in wp-admin/admin.php.

Fixes #30958.

File:

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

trunk/src/wp-admin/menu-header.php

@@ -67 +67 @@
         }
 
-        if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
+        if ( ( $parent_file && $item[2] == $parent_file ) || ( ! $typenow && $self == $item[2] ) ) {
             $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
         } else {
@@ -168 +168 @@
 
                 // Handle current for post_type=post|page|foo pages, which won't match $self.
-                $self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
+                $self_type = $typenow ? $self . '?post_type=' . $typenow : 'nothing';
 
                 if ( isset( $submenu_file ) ) {
@@ -176 +176 @@
                 // This allows plugin pages with the same hook to exist under different parents.
                 } elseif (
-                    ( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
-                    ( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+                    ( ! $plugin_page && $self == $sub_item[2] ) ||
+                    ( $plugin_page && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
                 ) {
                     $class[] = 'current';