vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-03 20:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
Fixes #30958.


git-svn-id: https://develop.svn.wordpress.org/trunk@31106 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2015-01-08 22:51:30 +00:00
parent c4e2ad04a2
commit 0c37f866f2
4 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/wp-admin/admin.php
View File

@@ -95,26 +95,24 @@ wp_enqueue_script( 'common' );
// declared as globals here
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 );
$plugin_page = plugin_basename($plugin_page);
}
if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
$typenow = $_REQUEST['post_type'];
}
else
$typenow = '';
if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
$taxnow = $_REQUEST['taxonomy'];
}
else
$taxnow = '';
if ( WP_NETWORK_ADMIN )
require(ABSPATH . 'wp-admin/network/menu.php');
@@ -153,12 +151,11 @@ if ( current_user_can( 'manage_options' ) ) {
*/
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);
@@ -176,18 +173,19 @@ if ( $plugin_page ) {
unset($the_parent);
}
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;
}
set_current_screen();
// Handle plugin admin pages.
if ( $plugin_page ) {
if ( isset($plugin_page) ) {
if ( $page_hook ) {
/**
* Fires before a particular screen is loaded.