Wizard 2.8.2-scripts

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

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index fc6f70780dd028c91f4499eac976210f0e313249..f8405f9a09406c3ba940eeddaa9b84425bd54e49 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -11,14 +11,25 @@
  *
  * @since unknown
  */
-define('WP_ADMIN', TRUE);
+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;
 }
@@ -31,8 +42,9 @@ 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');
 
@@ -134,7 +146,7 @@ if (isset($plugin_page)) {
 
        // Make sure rules are flushed
        global $wp_rewrite;
-       $wp_rewrite->flush_rules();
+       $wp_rewrite->flush_rules(false);
 
        exit();
 } else {