Changes in trunk/wp-admin/includes/update-core.php [15061:14774]

File:

• trunk/wp-admin/includes/update-core.php (modified) (5 diffs)

trunk/wp-admin/includes/update-core.php

@@ -173 +173 @@
 'wp-includes/gettext.php',
 'wp-includes/streams.php',
-// MU
-'wp-admin/wpmu-admin.php',
-'wp-admin/wpmu-blogs.php',
-'wp-admin/wpmu-edit.php',
-'wp-admin/wpmu-options.php',
-'wp-admin/wpmu-themes.php',
-'wp-admin/wpmu-upgrade-site.php',
-'wp-admin/wpmu-users.php',
-'wp-includes/wpmu-default-filters.php',
-'wp-includes/wpmu-functions.php',
-'wpmu-settings.php',
-'index-install.php',
-'README.txt',
-'htaccess.dist',
-'wp-admin/css/mu-rtl.css',
-'wp-admin/css/mu.css',
-'wp-admin/images/site-admin.png',
-'wp-admin/includes/mu.php',
-'wp-includes/images/wordpress-mu.png',
 // 3.0
 'wp-admin/categories.php',
@@ -212 +193 @@
 'wp-includes/js/jquery/interface.js',
 'wp-includes/js/jquery/autocomplete.js',
-'wp-includes/js/scriptaculous/prototype.js',
 'wp-includes/js/tinymce/wp-tinymce.js',
 'wp-content/themes/twentyten/searchform.php',
@@ -275 +255 @@
     $required_php_version = '4.3';
     $required_mysql_version = '4.1.2';
-    $wp_version = '3.0';
+    $wp_version = '2.9.1';
     $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' );
@@ -291 +271 @@
     // Sanity check the unzipped distribution
     apply_filters('update_feedback', __('Verifying the unpacked files…'));
-    $distro = '';
-    $roots = array( '/wordpress', '/wordpress-mu' );
-    foreach( $roots as $root ) {
-        if ( $wp_filesystem->exists($from . $root . '/wp-settings.php') && $wp_filesystem->exists($from . $root . '/wp-admin/admin.php') &&
-            $wp_filesystem->exists($from . $root . '/wp-includes/functions.php') ) {
-            $distro = $root;
-            break;
-        }
-    }
-    if ( !$distro ) {
+    if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
+        !$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) {
         $wp_filesystem->delete($from, true);
         return new WP_Error('insane_distro', __('The update could not be unpacked') );
@@ -314 +286 @@
 
     // Copy new versions of WP files into place.
-    $result = copy_dir($from . $distro, $to);
+    $result = copy_dir($from . '/wordpress', $to);
     if ( is_wp_error($result) ) {
         $wp_filesystem->delete($maintenance_file);