Changeset 45732 for trunk/src/wp-admin/includes/class-wp-site-health.php

Timestamp:

08/04/2019 12:01:14 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Site Health: If WP_DEFAULT_THEME doesn't exist, use WP_Theme::get_core_default_theme() as a fallback.

Props ajayghaghretiya1, juliobox, SergeyBiryukov.
Fixes #47299.

File:

• trunk/src/wp-admin/includes/class-wp-site-health.php (modified) (5 diffs)

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -446 +446 @@
                 $active_theme = wp_get_theme();
 
+                // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
+                $default_theme = wp_get_theme( WP_DEFAULT_THEME );
+                if ( ! $default_theme->exists() ) {
+                        $default_theme = WP_Theme::get_core_default_theme();
+                }
+
+                if ( $default_theme ) {
+                        $has_default_theme = true;
+
+                        if (
+                                $active_theme->get_stylesheet() === $default_theme->get_stylesheet()
+                        ||
+                                is_child_theme() && $active_theme->get_template() === $default_theme->get_template()
+                        ) {
+                                $using_default_theme = true;
+                        }
+                }
+
                 foreach ( $all_themes as $theme_slug => $theme ) {
                         $themes_total++;
 
-                        if ( WP_DEFAULT_THEME === $theme_slug ) {
-                                $has_default_theme = true;
-
-                                if ( get_stylesheet() === $theme_slug ) {
-                                        $using_default_theme = true;
-                                }
-                        }
-
                         if ( array_key_exists( $theme_slug, $theme_updates ) ) {
                                 $themes_need_updates++;
@@ -463 +473 @@
 
                 // If this is a child theme, increase the allowed theme count by one, to account for the parent.
-                if ( $active_theme->parent() ) {
+                if ( is_child_theme() ) {
                         $allowed_theme_count++;
-
-                        if ( $active_theme->get_template() === WP_DEFAULT_THEME ) {
-                                $using_default_theme = true;
-                        }
                 }
 
@@ -525 +531 @@
 
                         // This is a child theme, so we want to be a bit more explicit in our messages.
-                        if ( $active_theme->parent() ) {
+                        if ( is_child_theme() ) {
                                 // Recommend removing inactive themes, except a default theme, your current one, and the parent theme.
                                 $result['status'] = 'recommended';
@@ -565 +571 @@
                                                         /* translators: 1: The default theme for WordPress. 2: The currently active theme. 3: The active theme's parent theme. */
                                                         __( 'To enhance your site’s security, we recommend you remove any themes you’re not using. You should keep %1$s, the default WordPress theme, %2$s, your current theme, and %3$s, its parent theme.' ),
-                                                        WP_DEFAULT_THEME,
+                                                        $default_theme ? $default_theme->name : WP_DEFAULT_THEME,
                                                         $active_theme->name,
                                                         $active_theme->parent()->name
@@ -603 +609 @@
                                                         ),
                                                         $themes_inactive,
-                                                        WP_DEFAULT_THEME,
+                                                        $default_theme ? $default_theme->name : WP_DEFAULT_THEME,
                                                         $active_theme->name
                                                 ),