Ticket #11639: 11639-testing-only.diff

wp-admin/includes/class-wp-upgrader.php

@@ -781 +781 @@
                 if ( is_wp_error($working_dir) )
                         return $working_dir;
 
-                // Copy update-core.php from the new version into place.
-                if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
-                        $wp_filesystem->delete($working_dir, true);
-                        return new WP_Error('copy_failed', $this->strings['copy_failed']);
-                }
-                $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
-
+                $wp_filesystem->delete($working_dir . '/wordpress/wp-admin/includes/update-core.php');
                 require(ABSPATH . 'wp-admin/includes/update-core.php');
 
                 return update_core($working_dir, $wp_dir);

wp-includes/wp-db.php

@@ -1127 +1127 @@
          * @return false|string false on failure, version number on success
          */
         function db_version() {
+                return '4.1.1';
                 return preg_replace('/[^0-9.].*/', '', mysql_get_server_info( $this->dbh ));
         }
 }