<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45732] trunk/src/wp-admin/includes/class-wp-site-health.php: Site Health: If `WP_DEFAULT_THEME` doesn't exist, use `WP_Theme::get_core_default_theme()` as a fallback.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45732">45732</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45732","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-08-04 00:01:14 +0000 (Sun, 04 Aug 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Site Health: If `WP_DEFAULT_THEME` doesn't exist, use `WP_Theme::get_core_default_theme()` as a fallback.
Props ajayghaghretiya1, juliobox, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/47299">#47299</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2019-08-03 22:16:23 UTC (rev 45731)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2019-08-04 00:01:14 UTC (rev 45732)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,17 +445,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $all_themes = wp_get_themes();
</span><span class="cx" style="display: block; padding: 0 10px"> $active_theme = wp_get_theme();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $all_themes as $theme_slug => $theme ) {
- $themes_total++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( WP_DEFAULT_THEME === $theme_slug ) {
- $has_default_theme = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $default_theme ) {
+ $has_default_theme = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_stylesheet() === $theme_slug ) {
- $using_default_theme = true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ $active_theme->get_stylesheet() === $default_theme->get_stylesheet()
+ ||
+ is_child_theme() && $active_theme->get_template() === $default_theme->get_template()
+ ) {
+ $using_default_theme = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $all_themes as $theme_slug => $theme ) {
+ $themes_total++;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_exists( $theme_slug, $theme_updates ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_need_updates++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,12 +472,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If this is a child theme, increase the allowed theme count by one, to account for the parent.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $active_theme->parent() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_child_theme() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_theme_count++;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( $active_theme->get_template() === WP_DEFAULT_THEME ) {
- $using_default_theme = true;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there's a default theme installed and not in use, we count that as allowed as well.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $has_unused_themes && $show_unused_themes && ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This is a child theme, so we want to be a bit more explicit in our messages.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $active_theme->parent() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_child_theme() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Recommend removing inactive themes, except a default theme, your current one, and the parent theme.
</span><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'recommended';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,7 +570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: The default theme for WordPress. 2: The currently active theme. 3: The active theme's parent theme. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '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.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- WP_DEFAULT_THEME,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_theme ? $default_theme->name : WP_DEFAULT_THEME,
</ins><span class="cx" style="display: block; padding: 0 10px"> $active_theme->name,
</span><span class="cx" style="display: block; padding: 0 10px"> $active_theme->parent()->name
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,7 +608,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_inactive
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_inactive,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- WP_DEFAULT_THEME,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_theme ? $default_theme->name : WP_DEFAULT_THEME,
</ins><span class="cx" style="display: block; padding: 0 10px"> $active_theme->name
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'We recommend removing any unused themes to enhance your site’s security.' )
</span></span></pre>
</div>
</div>
</body>
</html>