Changeset 12731

Timestamp:

01/15/2010 08:21:18 PM (15 years ago)

Author:

ryan

Message:

Move current_screen setup before plugin page handling so it is defined for all cases. see #9674

File:

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

trunk/wp-admin/admin.php

@@ -83 +83 @@
 do_action('admin_init');
 
-// Handle plugin admin pages.
-if (isset($plugin_page)) {
+if (isset($plugin_page) ) {
     if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) {
         $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
@@ -98 +97 @@
         }
     }
-
-    if ( $page_hook ) {
-        do_action('load-' . $page_hook);
-        if (! isset($_GET['noheader']))
-            require_once(ABSPATH . 'wp-admin/admin-header.php');
-
-        do_action($page_hook);
-    } else {
-        if ( validate_file($plugin_page) ) {
-            wp_die(__('Invalid plugin page'));
-        }
-
-        if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
-            wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
-
-        do_action('load-' . $plugin_page);
-
-        if (! isset($_GET['noheader']))
-            require_once(ABSPATH . 'wp-admin/admin-header.php');
-
-        if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-            include(WPMU_PLUGIN_DIR . "/$plugin_page");
-        else
-            include(ABSPATH . PLUGINDIR . "/$plugin_page");
-    }
-
-    include(ABSPATH . 'wp-admin/admin-footer.php');
-
-    exit();
-} else if (isset($_GET['import'])) {
-
-    $importer = $_GET['import'];
-
-    if ( ! current_user_can('import') )
-        wp_die(__('You are not allowed to import.'));
-
-    if ( validate_file($importer) ) {
-        wp_die(__('Invalid importer.'));
-    }
-
-    // Allow plugins to define importers as well
-    if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]))
-    {
-        if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-        {
-            wp_die(__('Cannot load importer.'));
-        }
-        include(ABSPATH . "wp-admin/import/$importer.php");
-    }
-
-    $parent_file = 'tools.php';
-    $submenu_file = 'import.php';
-    $title = __('Import');
-
-    if (! isset($_GET['noheader']))
-        require_once(ABSPATH . 'wp-admin/admin-header.php');
-
-    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-
-    define('WP_IMPORTING', true);
-    if ( is_multisite() ) {
-        kses_init_filters();  // Always filter imported data with kses.
-    }
-
-    call_user_func($wp_importers[$importer][2]);
-
-    include(ABSPATH . 'wp-admin/admin-footer.php');
-
-    // Make sure rules are flushed
-    global $wp_rewrite;
-    $wp_rewrite->flush_rules(false);
-
-    exit();
-} else {
-    do_action("load-$pagenow");
-}
-
-if ( !empty($_REQUEST['action']) )
-    do_action('admin_action_' . $_REQUEST['action']);
+}
 
 $hook_suffix = '';
@@ -217 +138 @@
 $current_screen = apply_filters('current_screen', $current_screen);
 
+// Handle plugin admin pages.
+if ( isset($plugin_page) ) {
+    if ( $page_hook ) {
+        do_action('load-' . $page_hook);
+        if (! isset($_GET['noheader']))
+            require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+        do_action($page_hook);
+    } else {
+        if ( validate_file($plugin_page) ) {
+            wp_die(__('Invalid plugin page'));
+        }
+
+        if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
+            wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+
+        do_action('load-' . $plugin_page);
+
+        if (! isset($_GET['noheader']))
+            require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+        if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
+            include(WPMU_PLUGIN_DIR . "/$plugin_page");
+        else
+            include(ABSPATH . PLUGINDIR . "/$plugin_page");
+    }
+
+    include(ABSPATH . 'wp-admin/admin-footer.php');
+
+    exit();
+} else if (isset($_GET['import'])) {
+
+    $importer = $_GET['import'];
+
+    if ( ! current_user_can('import') )
+        wp_die(__('You are not allowed to import.'));
+
+    if ( validate_file($importer) ) {
+        wp_die(__('Invalid importer.'));
+    }
+
+    // Allow plugins to define importers as well
+    if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]))
+    {
+        if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
+        {
+            wp_die(__('Cannot load importer.'));
+        }
+        include(ABSPATH . "wp-admin/import/$importer.php");
+    }
+
+    $parent_file = 'tools.php';
+    $submenu_file = 'import.php';
+    $title = __('Import');
+
+    if (! isset($_GET['noheader']))
+        require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+
+    define('WP_IMPORTING', true);
+    if ( is_multisite() ) {
+        kses_init_filters();  // Always filter imported data with kses.
+    }
+
+    call_user_func($wp_importers[$importer][2]);
+
+    include(ABSPATH . 'wp-admin/admin-footer.php');
+
+    // Make sure rules are flushed
+    global $wp_rewrite;
+    $wp_rewrite->flush_rules(false);
+
+    exit();
+} else {
+    do_action("load-$pagenow");
+}
+
+if ( !empty($_REQUEST['action']) )
+    do_action('admin_action_' . $_REQUEST['action']);
+
 ?>