Changeset 23252

Timestamp:

01/03/2013 07:17:36 AM (13 years ago)

Author:

dd32

Message:

Upgrade: When upgrading from WordPress 3.5, if an empty twentytwelve theme directory exists, remove it and install Twenty Twelve. See #22856. For the 3.5 branch

File:

• branches/3.5/wp-admin/includes/update-core.php (modified) (1 diff)

branches/3.5/wp-admin/includes/update-core.php

@@ -693 +693 @@
     }
 
+    // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
+    if ( '3.5' == $old_wp_version ) {
+        if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' )  ) {
+            // Bumping the introduced version to 3.5.1 for the affected users causes Twenty Twelve to be installed for the first time
+            if ( $wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' ) )
+                $_new_bundled_files[ 'themes/twentytwelve/' ] = '3.5.1';
+        }
+    }
+
     // Copy New bundled plugins & themes
     // This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.