Ticket #17816: 17816.diff

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

@@ -915 +915 @@
                 $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
 
                 require(ABSPATH . 'wp-admin/includes/update-core.php');
+                /*
+                TODO (@dd32)
+                @nacin, $development_update is to cause $new_bundled_items to be force-updated for development updates
+                Is the following logic the only time needed? What about RC2->Final releases?
+                */
+                $development_update = ( 'development' == $current->response );
 
-                return update_core($working_dir, $wp_dir);
+                return update_core($working_dir, $wp_dir, $development_update);
         }
 
 }

wp-admin/includes/update-core.php

@@ -277 +277 @@
 
 $_new_bundled_files = array(
 'plugins/akismet/' => '2.0',
+'plugins/hello.php' => '2.0',
 'themes/twentyten/' => '3.0',
-'themes/twentyeleven/' => '3.2'
+'themes/twentyeleven/' => '3.2',
 );
 
 /**
@@ -325 +326 @@
  *
  * @param string $from New release unzipped path.
  * @param string $to Path to old WordPress installation.
+ * @param bool $development_update If this is a -dev update
  * @return WP_Error|null WP_Error on failure, null on success.
  */
-function update_core($from, $to) {
+function update_core($from, $to, $development_update = false ) {
         global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;
 
         @set_time_limit( 300 );
@@ -401 +403 @@
         if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
                 $old_version = $GLOBALS['wp_version']; // $wp_version in local scope == new version
                 foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {
-                        // If $introduced version is greater than what the site was previously running
-                        if ( version_compare($introduced_version, $old_version, '>') ) {
+                        // If $introduced version is greater than what the site was previously running                  
+                        if ( $development_update || version_compare($introduced_version, $old_version, '>') ) {
                                 $directory = ('/' == $file[ strlen($file)-1 ]);
                                 list($type, $filename) = explode('/', $file, 2);
 
@@ -414 +416 @@
                                         continue;
 
                                 if ( ! $directory ) {
-                                        if ( $wp_filesystem->exists($dest . $filename) )
-                                                continue;
-
                                         if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
                                                 $result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . $filename);
                                 } else {
-                                        if ( $wp_filesystem->is_dir($dest . $filename) )
-                                                continue;
-
                                         $wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
                                         $_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
                                         if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going.