Changeset 31106 for trunk/src/wp-admin/admin.php

Timestamp:

01/08/2015 10:51:30 PM (11 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.

File:

• trunk/src/wp-admin/admin.php (modified) (4 diffs)

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 ) {
         /**