Changeset 31106

Timestamp:

01/08/2015 10:51:30 PM (6 years ago)

Author:

wonderboymusic

Message:

After [31105], don't ditch the isset() calls for BC. Declare $page_hook as null so it is initialized for all execution paths but will still fail isset() checks.

Fixes #30958.

Location:

trunk/src

Files:

• wp-admin/admin.php (modified) (4 diffs)
• wp-admin/includes/plugin.php (modified) (10 diffs)
• wp-admin/menu-header.php (modified) (3 diffs)
• wp-includes/deprecated.php (modified) (1 diff)

trunk/src/wp-admin/admin.php

@@ -96 +96 @@
 global $pagenow, $hook_suffix, $plugin_page, $typenow, $taxnow;
 
-$page_hook = '';
-$hook_suffix = '';
-$plugin_page = '';
-$typenow = '';
-$taxnow = '';
+$page_hook = null;
 
 $editing = false;
 
-if ( isset( $_GET['page'] ) ) {
+if ( isset($_GET['page']) ) {
     $plugin_page = wp_unslash( $_GET['page'] );
-    $plugin_page = plugin_basename( $plugin_page );
-}
-
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
+    $plugin_page = plugin_basename($plugin_page);
+}
+
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
     $typenow = $_REQUEST['post_type'];
-}
-
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
+else
+    $typenow = '';
+
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
     $taxnow = $_REQUEST['taxonomy'];
-}
+else
+    $taxnow = '';
 
 if ( WP_NETWORK_ADMIN )
@@ -154 +152 @@
 do_action( 'admin_init' );
 
-if ( $plugin_page ) {
-    if ( $typenow ) {
+if ( isset($plugin_page) ) {
+    if ( !empty($typenow) )
         $the_parent = $pagenow . '?post_type=' . $typenow;
-    } else {
+    else
         $the_parent = $pagenow;
-    }
     if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
         $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
@@ -177 +174 @@
 }
 
-if ( $page_hook ) {
+$hook_suffix = '';
+if ( isset( $page_hook ) ) {
     $hook_suffix = $page_hook;
-} elseif ( $plugin_page ) {
+} elseif ( isset( $plugin_page ) ) {
     $hook_suffix = $plugin_page;
-} elseif ( $pagenow ) {
+} elseif ( isset( $pagenow ) ) {
     $hook_suffix = $pagenow;
 }
@@ -188 +186 @@
 
 // Handle plugin admin pages.
-if ( $plugin_page ) {
+if ( isset($plugin_page) ) {
     if ( $page_hook ) {
         /**

trunk/src/wp-admin/includes/plugin.php

@@ -1509 +1509 @@
     }
 
-    if ( $pagenow == 'admin.php' && $plugin_page ) {
+    if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
         foreach ( (array)$menu as $parent_menu ) {
             if ( $parent_menu[2] == $plugin_page ) {
@@ -1526 +1526 @@
     }
 
-    if ( $plugin_page && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
+    if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
         $parent_file = $pagenow;
         if ( isset( $_wp_real_parent_file[$parent_file] ) )
@@ -1537 +1537 @@
             if ( isset( $_wp_real_parent_file[$parent] ) )
                 $parent = $_wp_real_parent_file[$parent];
-            if ( $typenow && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+            if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
                 $parent_file = $parent;
                 return $parent;
-            } elseif ( $submenu_array[2] == $pagenow && ! $typenow && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+            } elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
                 $parent_file = $parent;
                 return $parent;
-            } elseif ( $plugin_page && ($plugin_page == $submenu_array[2] ) ) {
+            } elseif ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
                 $parent_file = $parent;
                 return $parent;
@@ -1576 +1576 @@
                     $title = $menu_array[3];
                     return $menu_array[3];
-                } elseif ( $plugin_page && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
+                } elseif ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
                     $title = $menu_array[3];
                     return $menu_array[3];
@@ -1588 +1588 @@
         foreach ( array_keys( $submenu ) as $parent ) {
             foreach ( $submenu[$parent] as $submenu_array ) {
-                if ( $plugin_page &&
+                if ( isset( $plugin_page ) &&
                     ( $plugin_page == $submenu_array[2] ) &&
                     (
@@ -1595 +1595 @@
                         ( $plugin_page == $hook ) ||
                         ( $pagenow == 'admin.php' && $parent1 != $submenu_array[2] ) ||
-                        ( $typenow && $parent == $pagenow . '?post_type=' . $typenow)
+                        ( !empty($typenow) && $parent == $pagenow . '?post_type=' . $typenow)
                     )
                     ) {
@@ -1616 +1616 @@
         if ( empty ( $title ) ) {
             foreach ( $menu as $menu_array ) {
-                if ( $plugin_page &&
+                if ( isset( $plugin_page ) &&
                     ( $plugin_page == $menu_array[2] ) &&
                     ( $pagenow == 'admin.php' ) &&
@@ -1671 +1671 @@
     $parent = get_admin_page_parent();
 
-    if ( ! $plugin_page && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
+    if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
         return false;
 
-    if ( $plugin_page ) {
+    if ( isset( $plugin_page ) ) {
         if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
             return false;
@@ -1689 +1689 @@
         if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
             return false;
-        if ( $plugin_page && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
+        if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
             return false;
-        if ( $plugin_page && isset( $_wp_menu_nopriv[$plugin_page] ) )
+        if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
             return false;
         foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
             if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
                 return false;
-            if ( $plugin_page && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
+            if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
             return false;
         }
@@ -1702 +1702 @@
     }
 
-    if ( $plugin_page && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+    if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
         return false;
 
     if ( isset( $submenu[$parent] ) ) {
         foreach ( $submenu[$parent] as $submenu_array ) {
-            if ( $plugin_page && ( $submenu_array[2] == $plugin_page ) ) {
+            if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
                 if ( current_user_can( $submenu_array[1] ))
                     return true;

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

@@ -67 +67 @@
         }
 
-        if ( ( $parent_file && $item[2] == $parent_file ) || ( ! $typenow && $self == $item[2] ) ) {
+        if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($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 = $typenow ? $self . '?post_type=' . $typenow : 'nothing';
+                $self_type = ! empty( $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 (
-                    ( ! $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 ) )
+                    ( ! 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 ) )
                 ) {
                     $class[] = 'current';

trunk/src/wp-includes/deprecated.php

@@ -2577 +2577 @@
     global $plugin_page;
 
-    if ( $plugin_page )
+    if ( isset($plugin_page) )
         return true;