WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dion Hulse 2016-11-01 01:24:35 +00:00
parent 0ff0dcc7de
commit 70b1d2071b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/update-core.php
View File

@ -725,8 +725,9 @@ $_old_files = array(
* Directories should be noted by suffixing it with a trailing slash (/) * Directories should be noted by suffixing it with a trailing slash (/)
* *
* @since 3.2.0 * @since 3.2.0
* @since 4.4.0 New themes are not automatically installed on upgrade. * @since 4.7.0 New themes were not automatically installed for 4.4-4.6 on
* This can still be explicitly asked for by defining * 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. * CORE_UPGRADE_SKIP_NEW_BUNDLED as false.
* @global array $_new_bundled_files * @global array $_new_bundled_files
* @var array * @var array
@ -746,11 +747,6 @@ $_new_bundled_files = array(
'themes/twentyseventeen/' => '4.7', '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. * Upgrades the core of WordPress.
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.