Index: wp-admin/admin.php =================================================================== --- wp-admin/admin.php (revision 18542) +++ wp-admin/admin.php (working copy) @@ -31,33 +31,29 @@ if ( get_option('db_upgraded') ) { $wp_rewrite->flush_rules(); - update_option( 'db_upgraded', false ); + 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 ) { - if ( !is_multisite() ) { - wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI'])))); + // Runs on the next page load after successful upgrade + do_action( 'after_db_upgrade' ); + +} elseif ( get_option( 'db_version' ) != $wp_db_version ) { + if ( ! is_multisite() ) { + define( 'WP_INSTALLING', true ); + require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); + delete_site_transient( 'update_core' ); + wp_upgrade(); + wp_redirect( $_SERVER['REQUEST_URI'] ); exit; } elseif ( apply_filters( 'do_mu_upgrade', true ) ) { - /** - * On really small MU installs run the upgrader every time, - * else run it less often to reduce load. - * - * @since 2.8.4b - */ + // On really small MU installs run the upgrader every time, + // else run it less often to reduce load. $c = get_blog_count(); - if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) { + if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) { require_once( ABSPATH . WPINC . '/http.php' ); - $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) ); - do_action( 'after_mu_upgrade', $response ); - unset($response); + wp_upgrade(); + do_action( 'after_mu_upgrade', '' ); } - unset($c); + unset( $c ); } } Index: wp-admin/upgrade.php =================================================================== --- wp-admin/upgrade.php (revision 18542) +++ wp-admin/upgrade.php (working copy) @@ -17,94 +17,12 @@ /** Load WordPress Bootstrap */ require( '../wp-load.php' ); -timer_start(); require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); +delete_site_transient( 'update_core' ); -delete_site_transient('update_core'); - -if ( isset( $_GET['step'] ) ) - $step = $_GET['step']; -else - $step = 0; - -// Do it. No output. -if ( 'upgrade_db' === $step ) { - wp_upgrade(); +wp_upgrade(); +if ( 'upgrade_db' === $_GET['step'] ) die( '0' ); -} -$step = (int) $step; - -$php_version = phpversion(); -$mysql_version = $wpdb->db_version(); -$php_compat = version_compare( $php_version, $required_php_version, '>=' ); -$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); - -@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); -?> - -> - - - <?php _e( 'WordPress › Update' ); ?> - - - -

WordPress

- - - -

-

-

- -WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); - elseif ( !$php_compat ) - printf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ); - elseif ( !$mysql_compat ) - printf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ); -?> - -

-

-

-

- -

-

-

- - - - - - +wp_safe_redirect( wp_get_referer() ); +exit; \ No newline at end of file