WordPress 4.7-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / update-core.php

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index a378d3ce95977bdeae0d12cd603f38c3d6d4a7e4..3e6aaa2051bf63547998b9d8b296ce7997269cf9 100644 (file)
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -720,8 +720,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
@@ -730,21 +731,17 @@ $_old_files = array(
 global $_new_bundled_files;
 
 $_new_bundled_files = array(
-       'plugins/akismet/'       => '2.0',
-       'themes/twentyten/'      => '3.0',
-       'themes/twentyeleven/'   => '3.2',
-       'themes/twentytwelve/'   => '3.5',
-       'themes/twentythirteen/' => '3.6',
-       'themes/twentyfourteen/' => '3.8',
-       'themes/twentyfifteen/'  => '4.1',
-       'themes/twentysixteen/'  => '4.4',
+       'plugins/akismet/'        => '2.0',
+       'themes/twentyten/'       => '3.0',
+       'themes/twentyeleven/'    => '3.2',
+       'themes/twentytwelve/'    => '3.5',
+       'themes/twentythirteen/'  => '3.6',
+       'themes/twentyfourteen/'  => '3.8',
+       'themes/twentyfifteen/'   => '4.1',
+       'themes/twentysixteen/'   => '4.4',
+       '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.
  *
@@ -902,6 +899,8 @@ function update_core($from, $to) {
                                        continue;
                                if ( ! file_exists( $working_dir_local . $file ) )
                                        continue;
+                               if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ) ) )
+                                       continue;
                                if ( md5_file( ABSPATH . $file ) === $checksum )
                                        $skip[] = $file;
                                else
@@ -963,6 +962,10 @@ function update_core($from, $to) {
                                continue;
                        if ( ! file_exists( $working_dir_local . $file ) )
                                continue;
+                       if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ) ) ) {
+                               $skip[] = $file;
+                               continue;
+                       }
                        if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum )
                                $skip[] = $file;
                        else