Skip to content

Optimize themes collection response when querying active theme #11032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aduth wants to merge 7 commits into
base: trunk
Choose a base branch
from
+57 −8
Open

Optimize themes collection response when querying active theme #11032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eed7987
Optimize themes collection response when querying active theme
aduth Feb 24, 2026
8ff7db4
Use Yoda conditional style
aduth Feb 24, 2026
a695820
Compare status as expected array, appending prepared theme
aduth Feb 24, 2026
9bb7db9
Inline call to wp_get_themes
aduth Feb 25, 2026
6d4f4e6
Add explicit test for active themes
aduth Feb 25, 2026
b4b9274
Explicitly assert count on returned data size
aduth Feb 25, 2026
47eba48
Merge branch 'trunk' into update/rest-themes-active
aduth Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,22 @@ public function get_item( $request ) {
public function get_items( $request ) {
$themes = array();

$active_themes = wp_get_themes();
$current_theme = wp_get_theme();
$status = $request['status'];

foreach ( $active_themes as $theme ) {
$theme_status = ( $this->is_same_theme( $theme, $current_theme ) ) ? 'active' : 'inactive';
if ( is_array( $status ) && ! in_array( $theme_status, $status, true ) ) {
continue;
}

$prepared = $this->prepare_item_for_response( $theme, $request );
if ( array( 'active' ) === $status ) {
$prepared = $this->prepare_item_for_response( $current_theme, $request );
$themes[] = $this->prepare_response_for_collection( $prepared );
} else {
foreach ( wp_get_themes() as $theme ) {
$theme_status = ( $this->is_same_theme( $theme, $current_theme ) ) ? 'active' : 'inactive';
if ( is_array( $status ) && ! in_array( $theme_status, $status, true ) ) {
continue;
}
Comment on lines +208 to +211
Copy link
Member Author

@aduth aduth Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some refactoring we could do here to avoid handling the active case, now that it's handled above.

Copy link
Member

@westonruter westonruter Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not completely though, right? The $status can have both active and inactive:

wordpress-develop/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php

Lines 722 to 729 in a695820

'status' => array(
'description' => __( 'Limit result set to themes assigned one or more statuses.' ),
'type' => 'array',
'items' => array(
'enum' => array( 'active', 'inactive' ),
'type' => 'string',
),
),

Copy link
Member Author

@aduth aduth Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I wrote the comment at the time that I thought $request['status'] was a string value and not an array (prior to a695820), so it's less clear now that there's much refactor opportunity here.


$prepared = $this->prepare_item_for_response( $theme, $request );
$themes[] = $this->prepare_response_for_collection( $prepared );
}
}

$response = rest_ensure_response( $themes );
Expand Down
45 changes: 45 additions & 0 deletions tests/phpunit/tests/rest-api/rest-themes-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,51 @@ public function test_get_items() {
$this->assertSameSets( $fields, array_keys( $data[0] ) );
}

/**
* Test retrieving a collection of active themes.
*
* @ticket 64719
*/
public function test_get_items_active() {
wp_set_current_user( self::$admin_id );
$request = new WP_REST_Request( 'GET', self::$themes_route );
$request->set_param( 'status', 'active' );

$response = rest_get_server()->dispatch( $request );

$this->assertSame( 200, $response->get_status() );
$data = $response->get_data();

$fields = array(
'_links',
'author',
'author_uri',
'description',
'is_block_theme',
'name',
'requires_php',
'requires_wp',
'screenshot',
'status',
'stylesheet',
'stylesheet_uri',
'tags',
'template',
'template_uri',
'textdomain',
'theme_uri',
'version',
'default_template_part_areas',
'default_template_types',
'theme_supports',
);
$this->assertIsArray( $data );
$this->assertCount( 1, $data );
$this->assertSameSets( $fields, array_keys( $data[0] ) );

$this->assertEquals( array( 'rest-api' ), wp_list_pluck( $data, 'stylesheet' ) );
}

/**
* Test retrieving a collection of inactive themes.
*
Expand Down
Loading