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.


git-svn-id: https://develop.svn.wordpress.org/trunk@39064 602fd350-edb4-49c9-b593-d223f7449a82

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

@@ -725,8 +725,9 @@ $_old_files = array(
  * Directories should be noted by suffixing it with a trailing slash (/)
  *
  * @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
  * @var array
@@ -746,11 +747,6 @@ $_new_bundled_files = array(
 	'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' );
-}
-
 /**
  * Upgrades the core of WordPress.
  *

tests/phpunit/tests/theme.php

@@ -187,7 +187,6 @@ class Tests_Theme extends WP_UnitTestCase {
 	 * @ticket 29925
 	 */
 	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 );
 		}