<!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>[45680] trunk/src/wp-admin/includes/class-wp-debug-data.php: Site Health: Show parent theme in its own accordion on Site Health Info screen; rename "Other Themes" to "Inactive Themes".</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/45680">45680</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/45680","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-07-26 03:48:32 +0000 (Fri, 26 Jul 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: Show parent theme in its own accordion on Site Health Info screen; rename "Other Themes" to "Inactive Themes".
Props garrett-eclipse, mukesh27, Clorith, xkon, msaggiorato.
Fixes <a href="https://core.trac.wordpress.org/ticket/46925">#46925</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpdebugdataphp"></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-debug-data.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-debug-data.php 2019-07-26 00:11:37 UTC (rev 45679)
+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2019-07-26 03:48:32 UTC (rev 45680)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,8 +128,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info['wp-themes'] = array(
- 'label' => __( 'Other Themes' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $info['wp-parent-theme'] = array(
+ 'label' => __( 'Parent Theme' ),
+ 'fields' => array(),
+ );
+
+ $info['wp-themes-inactive'] = array(
+ 'label' => __( 'Inactive Themes' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_count' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,11 +878,34 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $active_theme_author_uri = $active_theme->offsetGet( 'Author URI' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $active_theme->parent_theme ) {
+ $active_theme_parent_theme = sprintf(
+ // translators: 1: Theme name. 2: Theme slug.
+ __( '%1$s (%2$s)' ),
+ $active_theme->parent_theme,
+ $active_theme->template
+ );
+ $active_theme_parent_theme_debug = sprintf(
+ '%s (%s)',
+ $active_theme->parent_theme,
+ $active_theme->template
+ );
+ } else {
+ $active_theme_parent_theme = __( 'None' );
+ $active_theme_parent_theme_debug = 'none';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $info['wp-active-theme']['fields'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => $active_theme->Name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => sprintf(
+ // translators: 1: Theme name. 2: Theme slug.
+ __( '%1$s (%2$s)' ),
+ // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+ $active_theme->Name,
+ $active_theme->stylesheet
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Version' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,8 +924,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_theme' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Parent theme' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => ( $active_theme->parent_theme ? $active_theme->parent_theme : __( 'None' ) ),
- 'debug' => ( $active_theme->parent_theme ? $active_theme->parent_theme : 'none' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => $active_theme_parent_theme,
+ 'debug' => $active_theme_parent_theme_debug,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_features' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Theme features' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,18 +933,75 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_path' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Theme directory location' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => get_template_directory(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => get_stylesheet_directory(),
</ins><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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_theme = $active_theme->parent();
+
+ if ( $parent_theme ) {
+ // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+ $parent_theme_version = $parent_theme->Version;
+ $parent_theme_version_debug = $parent_theme_version;
+
+ if ( array_key_exists( $parent_theme->stylesheet, $theme_updates ) ) {
+ $parent_theme_update_new_version = $theme_updates[ $parent_theme->stylesheet ]->update['new_version'];
+
+ // translators: %s: Latest theme version number.
+ $parent_theme_version .= ' ' . sprintf( __( '(Latest version: %s)' ), $parent_theme_update_new_version );
+ $parent_theme_version_debug .= sprintf( ' (latest version: %s)', $parent_theme_update_new_version );
+ }
+
+ $parent_theme_author_uri = $parent_theme->offsetGet( 'Author URI' );
+
+ $info['wp-parent-theme']['fields'] = array(
+ 'name' => array(
+ 'label' => __( 'Name' ),
+ // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+ 'value' => sprintf(
+ // translators: 1: Theme name. 2: Theme slug.
+ __( '%1$s (%2$s)' ),
+ // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+ $parent_theme->Name,
+ $parent_theme->stylesheet
+ ),
+ ),
+ 'version' => array(
+ 'label' => __( 'Version' ),
+ 'value' => $parent_theme_version,
+ 'debug' => $parent_theme_version_debug,
+ ),
+ 'author' => array(
+ 'label' => __( 'Author' ),
+ // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+ 'value' => wp_kses( $parent_theme->Author, array() ),
+ ),
+ 'author_website' => array(
+ 'label' => __( 'Author website' ),
+ 'value' => ( $parent_theme_author_uri ? $parent_theme_author_uri : __( 'Undefined' ) ),
+ 'debug' => ( $parent_theme_author_uri ? $parent_theme_author_uri : '(undefined)' ),
+ ),
+ 'theme_path' => array(
+ 'label' => __( 'Theme directory location' ),
+ 'value' => get_template_directory(),
+ ),
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Populate a list of all themes available in the install.
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all_themes as $theme_slug => $theme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ignore the currently active theme from the list of all themes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exclude the currently active theme from the list of all themes.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $active_theme->stylesheet === $theme_slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Exclude the currently active parent theme from the list of all themes.
+ if ( ! empty( $parent_theme ) && $parent_theme->stylesheet === $theme_slug ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_version = $theme->Version;
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -953,7 +1038,7 @@
</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"> // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info['wp-themes']['fields'][ sanitize_text_field( $theme->Name ) ] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $info['wp-themes-inactive']['fields'][ sanitize_text_field( $theme->Name ) ] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: 1: Theme name. 2: Theme slug.
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s (%2$s)' ),
</span></span></pre>
</div>
</div>
</body>
</html>