<!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>[54817] trunk/src: Themes: Reduce usage of `wp_get_theme` function.</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/54817">54817</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/54817","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>spacedmonkey</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-11 16:24:47 +0000 (Fri, 11 Nov 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'>Themes: Reduce usage of `wp_get_theme` function.
Calling the `wp_get_theme` function creates a instance of the `WP_Theme` class. This can be a performance issue, if all you need is one property of the class instance. This change replaces the usage of `wp_get_theme()->get_stylesheet()` with `get_stylesheet()` to improve performance.
Props spacedmonkey, flixos90, peterwilsoncc, desrosj.
Fixes <a href="https://core.trac.wordpress.org/ticket/57057">#57057</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminsiteeditorphp">trunk/src/wp-admin/site-editor.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="#trunksrcwpincludesblockstemplatepartphp">trunk/src/wp-includes/blocks/template-part.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonresolverphp">trunk/src/wp-includes/class-wp-theme-json-resolver.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttemplatescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php</a></li>
<li><a href="#trunksrcwpincludesthemetemplatesphp">trunk/src/wp-includes/theme-templates.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminsiteeditorphp"></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/site-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/site-editor.php 2022-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-admin/site-editor.php 2022-11-11 16:24:47 UTC (rev 54817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,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"> $active_global_styles_id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$active_theme = wp_get_theme()->get_stylesheet();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$active_theme = get_stylesheet();
</ins><span class="cx" style="display: block; padding: 0 10px"> $preload_paths = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/wp/v2/media', 'OPTIONS' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/types?context=view',
</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-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-includes/block-template-utils.php 2022-11-11 16:24:47 UTC (rev 54817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/template-part' === $block['blockName'] &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! isset( $block['attrs']['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">- $block['attrs']['theme'] = wp_get_theme()->get_stylesheet();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block['attrs']['theme'] = get_stylesheet();
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_updated_content = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> function _build_block_template_result_from_file( $template_file, $template_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_template_types = get_default_block_template_types();
</span><span class="cx" style="display: block; padding: 0 10px"> $template_content = file_get_contents( $template_file['path'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme = wp_get_theme()->get_stylesheet();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme = get_stylesheet();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $template = new WP_Block_Template();
</span><span class="cx" style="display: block; padding: 0 10px"> $template->id = $theme . '//' . $template_file['slug'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = $terms[0]->name;
</span><span class="cx" style="display: block; padding: 0 10px"> $template_file = _get_block_template_file( $post->post_type, $post->post_name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_theme_file = get_stylesheet() === $theme && null !== $template_file;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $origin = get_post_meta( $post->ID, 'origin', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $is_wp_suggestion = get_post_meta( $post->ID, 'is_wp_suggestion', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,7 +907,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wp_theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'name',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'terms' => wp_get_theme()->get_stylesheet(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'terms' => get_stylesheet(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -973,7 +973,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"> $is_not_custom = false === array_search(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_get_theme()->get_stylesheet() . '//' . $template_file['slug'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_stylesheet() . '//' . $template_file['slug'],
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_list_pluck( $query_result, 'id' ),
</span><span class="cx" style="display: block; padding: 0 10px"> true
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,7 +1114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> list( $theme, $slug ) = $parts;
</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 ( wp_get_theme()->get_stylesheet() !== $theme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_stylesheet() !== $theme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/block-template-utils.php */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'get_block_file_template', null, $id, $template_type );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-includes/block-template.php 2022-11-11 16:24:47 UTC (rev 54817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Find all potential templates 'wp_template' post matching the hierarchy.
</span><span class="cx" style="display: block; padding: 0 10px"> $query = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme' => wp_get_theme()->get_stylesheet(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme' => get_stylesheet(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'slug__in' => $slugs,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = get_block_templates( $query );
</span></span></pre></div>
<a id="trunksrcwpincludesblockstemplatepartphp"></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/blocks/template-part.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/template-part.php 2022-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-includes/blocks/template-part.php 2022-11-11 16:24:47 UTC (rev 54817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $attributes['slug'] ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $attributes['theme'] ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_get_theme()->get_stylesheet() === $attributes['theme']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_stylesheet() === $attributes['theme']
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $template_part_id = $attributes['theme'] . '//' . $attributes['slug'];
</span><span class="cx" style="display: block; padding: 0 10px"> $template_part_query = new WP_Query(
</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-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-includes/class-wp-theme-json-resolver.php 2022-11-11 16:24:47 UTC (rev 54817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,13 +243,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __METHOD__, '5.9.0' );
</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">- $options = wp_parse_args( $options, array( 'with_supports' => true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options = wp_parse_args( $options, array( 'with_supports' => true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === static::$theme || ! static::has_same_registered_blocks( 'theme' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json_file = static::get_file_path_from_theme( 'theme.json' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_theme = wp_get_theme();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $theme_json_file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json_data = static::read_json_file( $theme_json_file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme_json_data = static::translate( $theme_json_data, $wp_theme->get( 'TextDomain' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json_data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,12 +266,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json_data = $theme_json->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> static::$theme = new WP_Theme_JSON( $theme_json_data );
</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 ( wp_get_theme()->parent() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_theme->parent() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get parent theme.json.
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_theme_json_file = static::get_file_path_from_theme( 'theme.json', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $parent_theme_json_file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_theme_json_data = static::read_json_file( $parent_theme_json_file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_theme_json_data = static::translate( $parent_theme_json_data, wp_get_theme()->parent()->get( 'TextDomain' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_theme_json_data = static::translate( $parent_theme_json_data, $wp_theme->parent()->get( 'TextDomain' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_theme = new WP_Theme_JSON( $parent_theme_json_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp"></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-global-styles-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-global-styles-controller.php 2022-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php 2022-11-11 16:24:47 UTC (rev 54817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,7 +564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_REST_Response|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_theme_item( $request ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_get_theme()->get_stylesheet() !== $request['stylesheet'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_stylesheet() !== $request['stylesheet'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This endpoint only supports the active theme for now.
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_theme_not_found',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +638,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_REST_Response|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_theme_items( $request ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_get_theme()->get_stylesheet() !== $request['stylesheet'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_stylesheet() !== $request['stylesheet'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This endpoint only supports the active theme for now.
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_theme_not_found',
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswpresttemplatescontrollerphp"></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-templates-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-templates-controller.php 2022-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php 2022-11-11 16:24:47 UTC (rev 54817)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,7 +528,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $changes->post_type = $this->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $changes->post_status = 'publish';
</span><span class="cx" style="display: block; padding: 0 10px"> $changes->tax_input = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_theme' => isset( $request['theme'] ) ? $request['theme'] : wp_get_theme()->get_stylesheet(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_theme' => isset( $request['theme'] ) ? $request['theme'] : get_stylesheet(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'custom' !== $template->source ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $changes->post_name = $template->slug;
</span></span></pre></div>
<a id="trunksrcwpincludesthemetemplatesphp"></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-templates.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-templates.php 2022-11-11 16:02:41 UTC (rev 54816)
+++ trunk/src/wp-includes/theme-templates.php 2022-11-11 16:24:47 UTC (rev 54817)
</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"> $terms = get_the_terms( $post_id, 'wp_theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $terms ) || ! count( $terms ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_post_terms( $post_id, wp_get_theme()->get_stylesheet(), 'wp_theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( $post_id, get_stylesheet(), 'wp_theme' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * in the case of new entities since is too early in the process to have been saved
</span><span class="cx" style="display: block; padding: 0 10px"> * to the entity. So for now we use the currently activated theme for creation.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme = wp_get_theme()->get_stylesheet();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme = get_stylesheet();
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = get_the_terms( $post_ID, 'wp_theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $terms && ! is_wp_error( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = $terms[0]->name;
</span></span></pre>
</div>
</div>
</body>
</html>