From 70b1d2071b616f296a2302f7f0918407932fcf49 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Tue, 1 Nov 2016 01:24:35 +0000
Subject: [PATCH] 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.

Built from https://develop.svn.wordpress.org/trunk@39064


git-svn-id: http://core.svn.wordpress.org/trunk@39006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/update-core.php | 10 +++-------
 wp-includes/version.php           |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 9a2430b89a..ae1bc88472 100644
--- a/wp-admin/includes/update-core.php
+++ b/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.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4cbe46d9d4..6efb62c2b4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta1-39063';
+$wp_version = '4.7-beta1-39064';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.