From e13ef071ff56c318d0b26e09661601da30e0c798 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Tue, 23 Apr 2019 21:36:02 +0000 Subject: [PATCH] Site Health: Fix count of inactive themes and the recommendation to remove them when the default theme is active or is a parent of the active child theme. Props sudhiryadav, ianbelanger, mukesh27, azaozz. Fixes #46900. git-svn-id: https://develop.svn.wordpress.org/trunk@45260 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-site-health.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php index 47f645c351..f777514617 100644 --- a/src/wp-admin/includes/class-wp-site-health.php +++ b/src/wp-admin/includes/class-wp-site-health.php @@ -464,10 +464,14 @@ class WP_Site_Health { // If this is a child theme, increase the allowed theme count by one, to account for the parent. if ( $active_theme->parent() ) { $allowed_theme_count++; + + if ( $active_theme->get_template() === WP_DEFAULT_THEME ) { + $using_default_theme = true; + } } - // If there's a default theme installed, we count that as allowed as well. - if ( $has_default_theme ) { + // If there's a default theme installed and not in use, we count that as allowed as well. + if ( $has_default_theme && ! $using_default_theme ) { $allowed_theme_count++; }