Wordpress 2.8-scripts

[autoinstalls/wordpress.git] / wp-admin / admin.php

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 20ff3693f5562b4e1d21c8ba6bee960223d995e0..2c216386dd9f880112c785a5eddcb9aac5888876 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,12 +1,35 @@
 <?php
-define('WP_ADMIN', TRUE);
+/**
+ * WordPress Administration Bootstrap
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * In WordPress Administration Panels
+ *
+ * @since unknown
+ */
+if ( !defined('WP_ADMIN') )
+       define('WP_ADMIN', TRUE);
 
 if ( defined('ABSPATH') )
        require_once(ABSPATH . 'wp-load.php');
 else
        require_once('../wp-load.php');
 
-if ( get_option('db_version') != $wp_db_version ) {
+if ( get_option('db_upgraded') ) {
+       $wp_rewrite->flush_rules();
+       update_option( 'db_upgraded',  false );
+
+       /**
+        * Runs on the next page load after successful upgrade
+        *
+        * @since 2.8
+        */
+       do_action('after_db_upgrade');
+} elseif ( get_option('db_version') != $wp_db_version ) {
        wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
        exit;
 }
@@ -19,15 +42,16 @@ nocache_headers();
 
 update_category_cache();
 
+set_screen_options();
+
 $posts_per_page = get_option('posts_per_page');
-$what_to_show = get_option('what_to_show');
 $date_format = get_option('date_format');
 $time_format = get_option('time_format');
 
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
 
-wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"), array('#07273E', '#14568A', '#D54E21', '#2683AE'));
-wp_admin_css_color('fresh', __('Fresh'), admin_url("css/colors-fresh.css"), array('#464646', '#CEE1EF', '#D54E21', '#2683AE'));
+wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
+wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF'));
 
 wp_enqueue_script( 'common' );
 wp_enqueue_script( 'jquery-color' );
@@ -45,7 +69,19 @@ do_action('admin_init');
 
 // Handle plugin admin pages.
 if (isset($plugin_page)) {
-       $page_hook = get_plugin_page_hook($plugin_page, $pagenow);
+       if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) {
+               $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
+               // backwards compatibility for plugins using add_management_page
+               if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+                       // There could be plugin specific params on the URL, so we need the whole query string
+                       if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
+                               $query_string = $_SERVER[ 'QUERY_STRING' ];
+                       else
+                               $query_string = 'page=' . $plugin_page;
+                       wp_redirect( 'tools.php?' . $query_string );
+                       exit;
+               }
+       }
 
        if ( $page_hook ) {
                do_action('load-' . $page_hook);
@@ -84,7 +120,7 @@ if (isset($plugin_page)) {
        }
 
        // Allow plugins to define importers as well
-       if (! is_callable($wp_importers[$importer][2]))
+       if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]))
        {
                if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
                {
@@ -93,7 +129,7 @@ if (isset($plugin_page)) {
                include(ABSPATH . "wp-admin/import/$importer.php");
        }
 
-       $parent_file = 'edit.php';
+       $parent_file = 'tools.php';
        $submenu_file = 'import.php';
        $title = __('Import');
 
@@ -108,6 +144,10 @@ if (isset($plugin_page)) {
 
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
+       // Make sure rules are flushed
+       global $wp_rewrite;
+       $wp_rewrite->flush_rules();
+
        exit();
 } else {
        do_action("load-$pagenow");