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

Timestamp:

01/08/2015 10:51:30 PM (12 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/includes/plugin.php (modified) (10 diffs)

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;