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

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.
Built from https://develop.svn.wordpress.org/trunk@45260


git-svn-id: http://core.svn.wordpress.org/trunk@45069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2019-04-23 21:37:53 +00:00
parent 2548263bac
commit 0da8c2265f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/class-wp-site-health.php
View File

@ -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 this is a child theme, increase the allowed theme count by one, to account for the parent.
if ( $active_theme->parent() ) { if ( $active_theme->parent() ) {
$allowed_theme_count++; $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 there's a default theme installed and not in use, we count that as allowed as well.
if ( $has_default_theme ) { if ( $has_default_theme && ! $using_default_theme ) {
$allowed_theme_count++; $allowed_theme_count++;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.2-beta3-45259'; $wp_version = '5.2-beta3-45260';
/** /**
* 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.