Changeset 35738

Timestamp:

11/25/2015 09:44:02 PM (11 years ago)

Author:

wonderboymusic

Message:

Upgrade: New themes are not automatically installed on upgrade. This can still be explicitly asked for by defining CORE_UPGRADE_SKIP_NEW_BUNDLED as false.

In populate_options(), if the theme specified by WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme. If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.

Props nacin, jeremyfelt, dd32.
See #34306.

Location:

trunk

Files:

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

trunk/src/wp-admin/includes/schema.php

@@ -369 +369 @@
         }
 
-        $template = WP_DEFAULT_THEME;
-        // If default theme is a child theme, we need to get its template
-        $theme = wp_get_theme( $template );
-        if ( ! $theme->errors() )
-                $template = $theme->get_template();
+        // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
+        $stylesheet = $template = WP_DEFAULT_THEME;
+        $theme = wp_get_theme( WP_DEFAULT_THEME );
+        if ( ! $theme->exists() ) {
+                $theme = WP_Theme::get_core_default_theme();
+        }
+
+        // If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
+        if ( $theme ) {
+                $stylesheet = $theme->get_stylesheet();
+                $template   = $theme->get_template();
+        }
 
         $timezone_string = '';
@@ -434 +441 @@
         'recently_edited' => '',
         'template' => $template,
-        'stylesheet' => WP_DEFAULT_THEME,
+        'stylesheet' => $stylesheet,
         'comment_whitelist' => 1,
         'blacklist_keys' => '',
@@ -915 +922 @@
         $stylesheet = get_option( 'stylesheet' );
         $allowed_themes = array( $stylesheet => true );
-        if ( $template != $stylesheet )
+
+        if ( $template != $stylesheet ) {
                 $allowed_themes[ $template ] = true;
-        if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template )
+        }
+
+        if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
                 $allowed_themes[ WP_DEFAULT_THEME ] = true;
+        }
+
+        // If WP_DEFAULT_THEME doesn't exist, also whitelist the latest core default theme.
+        if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
+                if ( $core_default = WP_Theme::get_core_default_theme() ) {
+                        $allowed_themes[ $core_default->get_stylesheet() ] = true;
+                }
+        }
 
         if ( 1 == $network_id ) {

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

@@ -716 +716 @@
  *
  * @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
+ *              CORE_UPGRADE_SKIP_NEW_BUNDLED as false.
  * @global array $_new_bundled_files
  * @var array
@@ -732 +735 @@
         'themes/twentysixteen/'  => '4.4',
 );
+
+// 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/src/wp-includes/class-wp-theme.php

@@ -57 +57 @@
                 'twentyfourteen' => 'Twenty Fourteen',
                 'twentyfifteen'  => 'Twenty Fifteen',
+                'twentysixteen'  => 'Twenty Sixteen',
         );
 
@@ -1152 +1153 @@
 
         /**
+         * Determines the latest WordPress default theme that is installed.
+         *
+         * This hits the filesystem.
+         *
+         * @return WP_Theme|false Object, or false if no theme is installed, which would be bad.
+         */
+        public static function get_core_default_theme() {
+                foreach ( array_reverse( self::$default_themes ) as $slug => $name ) {
+                        $theme = wp_get_theme( $slug );
+                        if ( $theme->exists() ) {
+                                return $theme;
+                        }
+                }
+                return false;
+        }
+
+        /**
          * Returns array of stylesheet names of themes allowed on the site or network.
          *

trunk/src/wp-includes/default-constants.php

@@ -349 +349 @@
          * Slug of the default theme for this install.
          * Used as the default theme when installing new sites.
-         * Will be used as the fallback if the current theme doesn't exist.
+         * It will be used as the fallback if the current theme doesn't exist.
+         *
          * @since 3.0.0
+         * @see WP_Theme::get_core_default_theme()
          */
         if ( !defined('WP_DEFAULT_THEME') )

trunk/src/wp-includes/theme.php

@@ -754 +754 @@
  * Checks that current theme files 'index.php' and 'style.css' exists.
  *
- * Does not check the default theme, which is the fallback and should always exist.
+ * Does not initially check the default theme, which is the fallback and should always exist.
+ * But if it doesn't exist, it'll fall back to the latest core default theme that does exist.
  * Will switch theme to the fallback theme if current theme does not validate.
+ *
  * You can use the 'validate_current_theme' filter to return false to
  * disable this functionality.
@@ -775 +777 @@
                 return true;
 
-        if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
+        if ( ! file_exists( get_template_directory() . '/index.php' ) ) {
+                // Invalid.
+        } elseif ( ! file_exists( get_template_directory() . '/style.css' ) ) {
+                // Invalid.
+        } elseif ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
+                // Invalid.
+        } else {
+                // Valid.
+                return true;
+        }
+
+        $default = wp_get_theme( WP_DEFAULT_THEME );
+        if ( $default->exists() ) {
                 switch_theme( WP_DEFAULT_THEME );
                 return false;
         }
 
-        if ( get_stylesheet() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/style.css') ) {
-                switch_theme( WP_DEFAULT_THEME );
-                return false;
-        }
-
-        if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
-                switch_theme( WP_DEFAULT_THEME );
-                return false;
-        }
-
-        return true;
+        /**
+         * If we're in an invalid state but WP_DEFAULT_THEME doesn't exist,
+         * switch to the latest core default theme that's installed.
+         * If it turns out that this latest core default theme is our current
+         * theme, then there's nothing we can do about that, so we have to bail,
+         * rather than going into an infinite loop. (This is why there are
+         * checks against WP_DEFAULT_THEME above, also.) We also can't do anything
+         * if it turns out there is no default theme installed. (That's `false`.)
+         */
+        $default = WP_Theme::get_core_default_theme();
+        if ( false === $default || get_stylesheet() == $default->get_stylesheet() ) {
+                return true;
+        }
+
+        switch_theme( $default->get_stylesheet() );
+        return false;
 }
 

trunk/tests/phpunit/tests/theme.php

@@ -177 +177 @@
          */
         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 );