Changeset 39064

Timestamp:

11/01/2016 01:23:17 AM (8 years ago)

Author:

dd32

Message:

Upgrade: Install new themes upon upgrade again.
This partially reverts [35738], which has shown to provide a bad user experience for users seeking to experiment with TwentySeventeen.

This will result in TwentySixteen being installed in addition to TwentySeventeen.

See #38551.

Location:

trunk

Files:

• src/wp-admin/includes/update-core.php (modified) (2 diffs)
• tests/phpunit/tests/theme.php (modified) (1 diff)

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

@@ -726 +726 @@
  *
  * @since 3.2.0
- * @since 4.4.0 New themes are not automatically installed on upgrade.
- *              This can still be explicitly asked for by defining
+ * @since 4.7.0 New themes were not automatically installed for 4.4-4.6 on
+ *              upgrade. New themes are now installed again. To disable new
+ *              themes from being installed on upgrade, explicitly define
  *              CORE_UPGRADE_SKIP_NEW_BUNDLED as false.
  * @global array $_new_bundled_files
@@ -746 +747 @@
     'themes/twentyseventeen/' => '4.7',
 );
-
-// If not explicitly defined as false, don't install new default themes.
-if ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || CORE_UPGRADE_SKIP_NEW_BUNDLED ) {
-    $_new_bundled_files = array( 'plugins/akismet/' => '2.0' );
-}
 
 /**

trunk/tests/phpunit/tests/theme.php

@@ -188 +188 @@
      */
     function test_default_theme_in_default_theme_list() {
-        $this->markTestSkipped( 'Core repository inclusion was stopped after Twenty Fifteen' );
         if ( 'twenty' === substr( WP_DEFAULT_THEME, 0, 6 ) ) {
             $this->assertContains( WP_DEFAULT_THEME, $this->default_themes );