<!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>[52610] trunk/src: Docs: Replace "Current theme" with "Active theme" in various DocBlocks.</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/52610">52610</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/52610","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-01-20 23:51:22 +0000 (Thu, 20 Jan 2022)</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'>Docs: Replace "Current theme" with "Active theme" in various DocBlocks.
This change replaces "Current theme" with "Active theme" in various DocBlocks for better consistency with user-facing strings.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52580">[52580]</a>.
Props Presskopp, audrasjb, costdev.
Fixes <a href="https://core.trac.wordpress.org/ticket/54831">#54831</a>.
See <a href="https://core.trac.wordpress.org/ticket/54770">#54770</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeinstallerskinphp">trunk/src/wp-admin/includes/class-theme-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesblocktemplateutilsphp">trunk/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#trunksrcwpincludesblocktemplatephp">trunk/src/wp-includes/block-template.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonresolverphp">trunk/src/wp-includes/class-wp-theme-json-resolver.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpscriptsphp">trunk/src/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesclasswpstylesphp">trunk/src/wp-includes/class.wp-styles.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizethemespanelphp">trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php</a></li>
<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestthemescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetsearchphp">trunk/src/wp-includes/widgets/class-wp-widget-search.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasscustomimageheaderphp"></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-custom-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1455,7 +1455,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"> * Given an attachment ID for a header image, unsets it as a user-uploaded
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * header image for the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * header image for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Triggered when the user clicks the overlay "X" button next to each image
</span><span class="cx" style="display: block; padding: 0 10px"> * choice in the Customizer's Header tool.
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeinstallerskinphp"></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-theme-installer-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-installer-skin.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-admin/includes/class-theme-installer-skin.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h2 class="update-from-upload-heading">' . esc_html__( 'This theme is already installed.' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check errors for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check errors for active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $current_theme_data->errors() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->feedback( 'current_theme_has_errors', $current_theme_data->errors()->get_error_message() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $table The output table with Name, Version, Author, RequiresWP, and RequiresPHP info.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Theme $current_theme_data Current theme data.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Theme $current_theme_data Active theme data.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $new_theme_data Array with uploaded theme data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> echo apply_filters( 'install_theme_overwrite_comparison', $table, $current_theme_data, $new_theme_data );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderphp"></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-theme-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-admin/includes/class-theme-upgrader.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +609,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Turn on maintenance mode before attempting to upgrade the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Turn on maintenance mode before attempting to upgrade the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Hooked to the {@see 'upgrader_pre_install'} filter by Theme_Upgrader::upgrade() and
</span><span class="cx" style="display: block; padding: 0 10px"> * Theme_Upgrader::bulk_upgrade().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,7 +627,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = isset( $theme['theme'] ) ? $theme['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">- // Only run if current theme
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only run if active theme
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_stylesheet() !== $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,7 +641,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Turn off maintenance mode after upgrading the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Turn off maintenance mode after upgrading the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Hooked to the {@see 'upgrader_post_install'} filter by Theme_Upgrader::upgrade()
</span><span class="cx" style="display: block; padding: 0 10px"> * and Theme_Upgrader::bulk_upgrade().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -659,7 +659,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = isset( $theme['theme'] ) ? $theme['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">- // Only run if current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only run if active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_stylesheet() !== $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></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/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-admin/includes/dashboard.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1987,7 +1987,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Displays a welcome panel to introduce users to WordPress.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.9.0 Send users to the Site Editor if the current theme is block-based.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Send users to the Site Editor if the active theme is block-based.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_welcome_panel() {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-admin/includes/file.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $default_types An array of editable theme file extensions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Theme $theme The current theme object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Theme $theme The active theme object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $file_types = apply_filters( 'wp_theme_editor_filetypes', $default_types, $theme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></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/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post_format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_format = '0';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add in the current one if it isn't there yet, in case the current theme doesn't support it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add in the current one if it isn't there yet, in case the active theme doesn't support it.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $post_format && ! in_array( $post_format, $post_formats[0], true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_formats[0][] = $post_format;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-admin/includes/theme.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +653,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $prepared_themes An associative array of theme data. Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Theme[]|null $themes An array of theme objects to prepare, if any.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $current_theme The current theme slug.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $current_theme The active theme slug.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +661,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $prepared_themes;
</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">- // Make sure the current theme is listed first.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure the active theme is listed first.
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared_themes[ $current_theme ] = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $themes ) {
</span></span></pre></div>
<a id="trunksrcwpincludesblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template-utils.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/block-template-utils.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Parses wp_template content and injects the current theme's
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Parses wp_template content and injects the active theme's
</ins><span class="cx" style="display: block; padding: 0 10px"> * stylesheet as a theme attribute into each wp_template_part
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span></span></pre></div>
<a id="trunksrcwpincludesblocktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/block-template.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_base_path = get_stylesheet_directory() . DIRECTORY_SEPARATOR;
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_theme_base_path = get_template_directory() . DIRECTORY_SEPARATOR;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Is the current theme a child theme, and is the PHP fallback template part of it?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Is the active theme a child theme, and is the PHP fallback template part of it?
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> strpos( $fallback_template, $theme_base_path ) === 0 &&
</span><span class="cx" style="display: block; padding: 0 10px"> strpos( $fallback_template, $parent_theme_base_path ) === false
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,9 +180,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' === $templates[0]->source
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Unfortunately, we cannot trust $templates[0]->theme, since it will always
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // be set to the current theme's slug by _build_block_template_result_from_file(),
- // even if the block template is really coming from the current theme's parent.
- // (The reason for this is that we want it to be associated with the current theme
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // be set to the active theme's slug by _build_block_template_result_from_file(),
+ // even if the block template is really coming from the active theme's parent.
+ // (The reason for this is that we want it to be associated with the active theme
</ins><span class="cx" style="display: block; padding: 0 10px"> // -- not its parent -- once we edit it and store it to the DB as a wp_template CPT.)
</span><span class="cx" style="display: block; padding: 0 10px"> // Instead, we use _get_block_template_file() to locate the block template file.
</span><span class="cx" style="display: block; padding: 0 10px"> $template_file = _get_block_template_file( 'wp_template', $fallback_template_slug );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Start preview and customize 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">- * Check if customize query variable exist. Init filters to filter the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Check if customize query variable exist. Init filters to filter the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Stop previewing the selected 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">- * Removes filters to change the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Removes filters to change the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1769,7 +1769,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $setting_params['type'] ) && 'theme_mod' === $setting_params['type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure that theme mods values are only used if they were saved under the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure that theme mods values are only used if they were saved under the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> $namespace_pattern = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( $namespace_pattern, $setting_id, $matches ) && $this->get_stylesheet() === $matches['stylesheet'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $values[ $matches['setting_id'] ] = $setting_params['value'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2297,7 +2297,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the current theme and return the name of the previewed theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the active theme and return the name of the previewed theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonresolverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json-resolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json-resolver.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/class-wp-theme-json-resolver.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,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"> * Returns the custom post type that contains the user's origin config
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * for the current theme or a void array if none are found.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * for the active theme or a void array if none are found.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This can also create and return a new draft custom post type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Theme $theme The theme object. If empty, it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * defaults to the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * defaults to the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param bool $create_post Optional. Whether a new custom post
</span><span class="cx" style="display: block; padding: 0 10px"> * type should be created if none are
</span><span class="cx" style="display: block; padding: 0 10px"> * found. Default false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whether the current theme has a theme.json file.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Whether the active theme has a theme.json file.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0 Added a check in the parent theme.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +708,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the page templates of the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the page templates of the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +732,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the template part data of current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the template part data of active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/class-wp-theme.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,7 +698,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Theme|false Parent theme, or false if the active theme is not a child theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function parent() {
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->parent ) ? $this->parent : false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * with the value of the translated header name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_post_templates() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If you screw up your active theme and we invalidate your parent, most things still work. Let it slide.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-scripts.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/class.wp-scripts.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Holds a string which contains the type attribute for script tag.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the current theme does not declare HTML5 support for 'script',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the active theme does not declare HTML5 support for 'script',
</ins><span class="cx" style="display: block; padding: 0 10px"> * then it initializes as `type='text/javascript'`.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.0
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-styles.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/class.wp-styles.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Holds a string which contains the type attribute for style tag.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the current theme does not declare HTML5 support for 'style',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the active theme does not declare HTML5 support for 'style',
</ins><span class="cx" style="display: block; padding: 0 10px"> * then it initializes as `type='text/css'`.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.0
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizethemespanelphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * An Underscore (JS) template for rendering this panel's container.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The themes panel renders a custom panel heading with the current theme and a switch themes button.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The themes panel renders a custom panel heading with the active theme and a switch themes button.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Panel::print_template()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-constants.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/default-constants.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Slug of the default theme for this installation.
</span><span class="cx" style="display: block; padding: 0 10px"> * Used as the default theme when installing new sites.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * It will be used as the fallback if the current theme doesn't exist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * It will be used as the fallback if the active theme doesn't exist.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestthemescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response->add_links( $this->prepare_links( $theme ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->get_stylesheet() === wp_get_theme()->get_stylesheet() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This creates a record for the current theme if not existent.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This creates a record for the active theme if not existent.
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/theme.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_directories = search_theme_directories();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $wp_theme_directories ) && count( $wp_theme_directories ) > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make sure the current theme wins out, in case search_theme_directories() picks the wrong
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure the active theme wins out, in case search_theme_directories() picks the wrong
</ins><span class="cx" style="display: block; padding: 0 10px"> // one in the case of a conflict. (Normally, last registered theme root wins.)
</span><span class="cx" style="display: block; padding: 0 10px"> $current_theme = get_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $theme_directories[ $current_theme ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,10 +105,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_theme_directories
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $stylesheet Optional. Directory name for the theme. Defaults to current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $stylesheet Optional. Directory name for the theme. Defaults to active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_root Optional. Absolute path of the theme root to look in.
</span><span class="cx" style="display: block; padding: 0 10px"> * If not specified, get_raw_theme_root() is used to calculate
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * the theme root for the $stylesheet provided (or current theme).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * the theme root for the $stylesheet provided (or active theme).
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Theme Theme object. Be sure to check the object's exists() method
</span><span class="cx" style="display: block; padding: 0 10px"> * if you need to confirm the theme's existence.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,11 +182,11 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves stylesheet directory path for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves stylesheet directory path for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Path to current theme's stylesheet directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Path to active theme's stylesheet directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_stylesheet_directory() {
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = get_stylesheet();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,12 +194,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet_dir = "$theme_root/$stylesheet";
</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">- * Filters the stylesheet directory path for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the stylesheet directory path for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $stylesheet_dir Absolute path to the current theme.
- * @param string $stylesheet Directory name of the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $stylesheet_dir Absolute path to the active theme.
+ * @param string $stylesheet Directory name of the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_root Absolute path to themes directory.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,11 +206,11 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves stylesheet directory URI for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves stylesheet directory URI for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string URI to current theme's stylesheet directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string URI to active theme's stylesheet directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_stylesheet_directory_uri() {
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves stylesheet URI for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves stylesheet URI for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The stylesheet file name is 'style.css' which is appended to the stylesheet directory URI path.
</span><span class="cx" style="display: block; padding: 0 10px"> * See get_stylesheet_directory_uri().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,18 +237,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string URI to current theme's stylesheet.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string URI to active theme's stylesheet.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_stylesheet_uri() {
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet_dir_uri = get_stylesheet_directory_uri();
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet_uri = $stylesheet_dir_uri . '/style.css';
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the URI of the current theme stylesheet.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the URI of the active theme stylesheet.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $stylesheet_uri Stylesheet URI for the current theme/child theme.
- * @param string $stylesheet_dir_uri Stylesheet directory URI for the current theme/child theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $stylesheet_uri Stylesheet URI for the active theme/child theme.
+ * @param string $stylesheet_dir_uri Stylesheet directory URI for the active theme/child theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Locale $wp_locale WordPress date and time locale object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string URI to current theme's localized stylesheet.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string URI to active theme's localized stylesheet.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_locale_stylesheet_uri() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_locale;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,7 +298,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves name of the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves name of the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,21 +306,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the name of the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the name of the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $template Current theme's directory name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $template active theme's directory name.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'template', get_option( 'template' ) );
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves template directory path for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves template directory path for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Path to current theme's template directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Path to active theme's template directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_template_directory() {
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_template();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,12 +328,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $template_dir = "$theme_root/$template";
</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">- * Filters the current theme directory path.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the active theme directory path.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $template_dir The path of the current theme directory.
- * @param string $template Directory name of the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $template_dir The path of the active theme directory.
+ * @param string $template Directory name of the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_root Absolute path to the themes directory.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'template_directory', $template_dir, $template, $theme_root );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,11 +340,11 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves template directory URI for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves template directory URI for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string URI to current theme's template directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string URI to active theme's template directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_template_directory_uri() {
</span><span class="cx" style="display: block; padding: 0 10px"> $template = str_replace( '%2F', '/', rawurlencode( get_template() ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,12 +352,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $template_dir_uri = "$theme_root_uri/$template";
</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">- * Filters the current theme directory URI.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the active theme directory URI.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $template_dir_uri The URI of the current theme directory.
- * @param string $template Directory name of the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $template_dir_uri The URI of the active theme directory.
+ * @param string $template Directory name of the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_root_uri The themes root URI.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Loop the registered theme directories and extract all themes */
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_theme_directories as $theme_root ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Start with directories in the root of the current theme directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Start with directories in the root of the active theme directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> $dirs = @ scandir( $theme_root );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $dirs ) {
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error( "$theme_root is not readable", E_USER_NOTICE );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,7 +683,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If requesting the root for the current theme, consult options to avoid calling get_theme_roots().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If requesting the root for the active theme, consult options to avoid calling get_theme_roots().
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $skip_cache ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( 'stylesheet' ) == $stylesheet_or_template ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root = get_option( 'stylesheet_root' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,11 +830,11 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Checks that the current theme has 'index.php' and 'style.css' files.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Checks that the active theme has 'index.php' and 'style.css' files.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Does not initially check the default theme, which is the fallback and should always exist.
</span><span class="cx" style="display: block; padding: 0 10px"> * But if it doesn't exist, it'll fall back to the latest core default theme that does exist.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Will switch theme to the fallback theme if current theme does not validate.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Will switch theme to the fallback theme if active theme does not validate.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * You can use the {@see 'validate_current_theme'} filter to return false to disable
</span><span class="cx" style="display: block; padding: 0 10px"> * this functionality.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -847,11 +847,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function validate_current_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">- * Filters whether to validate the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters whether to validate the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $validate Whether to validate the current theme. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $validate Whether to validate the active theme. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,7 +981,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves theme modification value for the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves theme modification value for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If the modification name does not exist and `$default` is a string, then the
</span><span class="cx" style="display: block; padding: 0 10px"> * default will be passed through the {@link https://www.php.net/sprintf sprintf()}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1007,7 +1007,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param mixed $current_mod The value of the current theme modification.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $current_mod The value of the active theme modification.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( "theme_mod_{$name}", $mods[ $name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1026,7 +1026,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Updates theme modification value for the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Updates theme modification value for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0 A return value was added.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,7 +1059,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Removes theme modification name from current theme list.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Removes theme modification name from active theme list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If removing the name also removes all elements, then the entire option
</span><span class="cx" style="display: block; padding: 0 10px"> * will be removed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,7 +1088,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Removes theme modifications option for current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Removes theme modifications option for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1395,7 +1395,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Gets the header images uploaded for the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets the header images uploaded for the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1875,7 +1875,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|null The custom_css post or null if none exists.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_custom_css_post( $stylesheet = '' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1926,7 +1926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The Custom CSS Post content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_custom_css( $stylesheet = '' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1968,7 +1968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $preprocessed Optional. Pre-processed CSS, stored in `post_content_filtered`.
</span><span class="cx" style="display: block; padding: 0 10px"> * Normally empty string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $stylesheet Optional. Stylesheet (child theme) to update.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Defaults to current theme/stylesheet.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defaults to active theme/stylesheet.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|WP_Error Post on success, error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2127,7 +2127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_editor_stylesheets() {
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheets = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Load editor_style.css if the current theme supports it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Load editor_style.css if the active theme supports it.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_styles = $GLOBALS['editor_styles'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3024,7 +3024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature The feature being checked. See add_theme_support() for the list
</span><span class="cx" style="display: block; padding: 0 10px"> * of possible values.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed ...$args Optional extra arguments to be checked against certain features.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True if the current theme supports the feature, false otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if the active theme supports the feature, false otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function current_theme_supports( $feature, ...$args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3074,7 +3074,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters whether the current theme supports a specific feature.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters whether the active theme supports a specific feature.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$feature`, refers to the specific
</span><span class="cx" style="display: block; padding: 0 10px"> * theme feature. See add_theme_support() for the list of possible values.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3081,7 +3081,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $supports Whether the current theme supports the given feature. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $supports Whether the active theme supports the given feature. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Array of arguments for the feature.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature The theme feature.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3096,7 +3096,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature The feature being checked. See add_theme_support() for the list
</span><span class="cx" style="display: block; padding: 0 10px"> * of possible values.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $include Path to the file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True if the current theme supports the supplied feature, false otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if the active theme supports the supplied feature, false otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function require_if_theme_supports( $feature, $include ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( $feature ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3109,7 +3109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers a theme feature for use in add_theme_support().
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This does not indicate that the current theme supports the feature, it only describes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This does not indicate that the active theme supports the feature, it only describes
</ins><span class="cx" style="display: block; padding: 0 10px"> * the feature's supported options.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3622,7 +3622,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $stylesheet Optional. Theme to customize. Defaults to current theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $stylesheet Optional. Theme to customize. Defaults to active theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> * The theme's stylesheet will be urlencoded if necessary.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4155,11 +4155,11 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns whether the current theme is a block-based theme or not.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns whether the active theme is a block-based theme or not.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return boolean Whether the current theme is a block-based theme or not.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return boolean Whether the active theme is a block-based theme or not.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_is_block_theme() {
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_get_theme()->is_block_theme();
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/update.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,7 +568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $checked = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $request = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Put slug of current theme into request.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Put slug of active theme into request.
</ins><span class="cx" style="display: block; padding: 0 10px"> $request['active'] = get_option( 'stylesheet' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $installed_themes as $theme ) {
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetsearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-search.php 2022-01-20 13:11:04 UTC (rev 52609)
+++ trunk/src/wp-includes/widgets/class-wp-widget-search.php 2022-01-20 23:51:22 UTC (rev 52610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo $args['before_title'] . $title . $args['after_title'];
</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">- // Use current theme search form if it exists.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Use active theme search form if it exists.
</ins><span class="cx" style="display: block; padding: 0 10px"> get_search_form();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $args['after_widget'];
</span></span></pre>
</div>
</div>
</body>
</html>