Wordpress 2.9.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / update-core.php

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 9aac1e77b7ff2078ea1cc80389bc703f7aa50364..d179e1eb9bf25980483ae1b76bbbb08164e5c8d8 100644 (file)
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -55,6 +55,12 @@ $_old_files = array(
 'wp-admin/js/link-cat.js',
 'wp-admin/js/forms.js',
 'wp-admin/js/upload.js',
+'wp-admin/js/set-post-thumbnail-handler.js',
+'wp-admin/js/set-post-thumbnail-handler.dev.js',
+'wp-admin/js/page.js',
+'wp-admin/js/page.dev.js',
+'wp-admin/js/slug.js',
+'wp-admin/js/slug.dev.js',
 'wp-admin/profile-update.php',
 'wp-admin/templates.php',
 'wp-includes/images/audio.png',
@@ -126,6 +132,8 @@ $_old_files = array(
 'wp-admin/edit-form-ajax-cat.php',
 'wp-admin/execute-pings.php',
 'wp-admin/import/b2.php',
+'wp-admin/import/btt.php',
+'wp-admin/import/jkw.php',
 'wp-admin/inline-uploading.php',
 'wp-admin/link-categories.php',
 'wp-admin/list-manipulation.js',
@@ -161,7 +169,9 @@ $_old_files = array(
 'wp-images/smilies',
 'wp-images/wp-small.png',
 'wp-images/wpminilogo.png',
-'wp.php'
+'wp.php',
+'wp-includes/gettext.php',
+'wp-includes/streams.php'
 );
 
 /**
@@ -205,10 +215,28 @@ $_old_files = array(
  * @return WP_Error|null WP_Error on failure, null on success.
  */
 function update_core($from, $to) {
-       global $wp_filesystem, $_old_files;
+       global $wp_filesystem, $_old_files, $wpdb;
 
        @set_time_limit( 300 );
 
+       $php_version    = phpversion();
+       $mysql_version  = $wpdb->db_version();
+       $required_php_version = '4.3';
+       $required_mysql_version = '4.1.2';
+       $wp_version = '2.9.2';
+       $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' );
+
+       if ( !$mysql_compat || !$php_compat )
+               $wp_filesystem->delete($from, true);
+
+       if ( !$mysql_compat && !$php_compat )
+               return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because 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 )
+               return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed 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 )
+               return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
+
        // Sanity check the unzipped distribution
        apply_filters('update_feedback', __('Verifying the unpacked files'));
        if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
@@ -229,7 +257,7 @@ function update_core($from, $to) {
        $result = copy_dir($from . '/wordpress', $to);
        if ( is_wp_error($result) ) {
                $wp_filesystem->delete($maintenance_file);
-               $wp_filesystem->delete($working_dir, true);
+               $wp_filesystem->delete($from, true);
                return $result;
        }