Changeset 27336 for trunk/src/wp-admin/includes/update-core.php

Timestamp:

03/01/2014 06:00:47 AM (12 years ago)

Author:

dd32

Message:

Upgrader: Copy wp-includes/version.php over last, to avoid an installation failing with the new version.php in place. Fixes #25860

File:

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

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

@@ -749 +749 @@
 
     // Don't copy wp-content, we'll deal with that below
-    $skip = array( 'wp-content' );
+    // We also copy version.php last so failed updates report their old version
+    $skip = array( 'wp-content', 'wp-includes/version.php' );
     $check_is_writable = array();
 
@@ -811 +812 @@
         $result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
 
+    // Since we know the core files have copied over, we can now copy the version file
+    if ( ! is_wp_error( $result ) ) {
+        if ( ! $r = $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $to . 'wp-includes/version.php', true /* overwrite */ ) ) {
+            $wp_filesystem->delete( $from, true );
+            $result = new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'WTFwp-includes/version.php' );
+        }
+        $wp_filesystem->chmod( $to . 'wp-includes/version.php', FS_CHMOD_FILE );
+    }
+
     // Check to make sure everything copied correctly, ignoring the contents of wp-content
     $skip = array( 'wp-content' );