Skip to content

Fix: Revision REST schema remove protected #11569

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
DarkMatter-999 wants to merge 4 commits into
base: trunk
Choose a base branch
from
+90 −0
Open

Fix: Revision REST schema remove protected #11569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96f340d
fix: remove `protected` property from revision rest schema
DarkMatter-999 Apr 13, 2026
6d8392e
fix: make checks more defensive
DarkMatter-999 Apr 13, 2026
63001b4
test: add tests to verify `protected` property is not included in the…
DarkMatter-999 Apr 14, 2026
d6c6c16
Merge branch 'trunk' into 53417-fix-revision-rest-schema-protected
DarkMatter-999 Apr 14, 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
10 changes: 10 additions & 0 deletions src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,10 +820,20 @@ public function get_item_schema() {

if ( ! empty( $parent_schema['properties']['content'] ) ) {
$schema['properties']['content'] = $parent_schema['properties']['content'];

// Revisions do not support password protection.
if ( isset( $schema['properties']['content']['properties']['protected'] ) ) {
unset( $schema['properties']['content']['properties']['protected'] );
}
}

if ( ! empty( $parent_schema['properties']['excerpt'] ) ) {
$schema['properties']['excerpt'] = $parent_schema['properties']['excerpt'];

// Revisions do not support password protection.
if ( isset( $schema['properties']['excerpt']['properties']['protected'] ) ) {
unset( $schema['properties']['excerpt']['properties']['protected'] );
}
}

if ( ! empty( $parent_schema['properties']['guid'] ) ) {
Expand Down
80 changes: 80 additions & 0 deletions tests/phpunit/tests/rest-api/rest-revisions-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,86 @@ public function test_get_items_pagination_header_of_the_first_page( $method ) {
$this->assertStringContainsString( '<' . $next_link . '>; rel="next"', $headers['Link'] );
}

/**
* Test that the 'protected' property is not included in the revision schema's content.
*
* Verifies the fix for the issue where revision schema incorrectly included
* 'protected' properties that don't actually exist in revision responses.
*
* @ticket 53417
*/
public function test_revision_schema_content_does_not_have_protected() {
$request = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts/' . self::$post_id . '/revisions' );
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$properties = $data['schema']['properties'];

$this->assertArrayHasKey( 'content', $properties );
$this->assertArrayHasKey( 'properties', $properties['content'] );
$this->assertArrayNotHasKey(
'protected',
$properties['content']['properties'],
'The "protected" property should not be present in revision content schema'
);

$this->assertArrayHasKey( 'raw', $properties['content']['properties'] );
$this->assertArrayHasKey( 'rendered', $properties['content']['properties'] );
$this->assertArrayHasKey( 'block_version', $properties['content']['properties'] );
}

/**
* Test that the 'protected' property is not included in the revision schema's excerpt.
*
* Verifies the fix for the issue where revision schema incorrectly included
* 'protected' properties that don't actually exist in revision responses.
*
* @ticket 53417
*/
public function test_revision_schema_excerpt_does_not_have_protected() {
$request = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts/' . self::$post_id . '/revisions' );
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$properties = $data['schema']['properties'];

$this->assertArrayHasKey( 'excerpt', $properties );
$this->assertArrayHasKey( 'properties', $properties['excerpt'] );
$this->assertArrayNotHasKey(
'protected',
$properties['excerpt']['properties'],
'The "protected" property should not be present in revision excerpt schema'
);

$this->assertArrayHasKey( 'raw', $properties['excerpt']['properties'] );
$this->assertArrayHasKey( 'rendered', $properties['excerpt']['properties'] );
}

/**
* Test that revision response data does not include the 'protected' property in excerpt.
*
* Verifies that actual revision responses don't include the 'protected' property,
* matching the corrected schema.
*
* @ticket 53417
*/
public function test_revision_response_excerpt_does_not_include_protected() {
wp_set_current_user( self::$editor_id );

$request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . self::$post_id . '/revisions/' . $this->revision_id1 );
$response = rest_get_server()->dispatch( $request );
$this->assertSame( 200, $response->get_status() );

$data = $response->get_data();

$this->assertArrayHasKey( 'excerpt', $data );
$this->assertArrayNotHasKey(
'protected',
$data['excerpt'],
'The "protected" property should not be present in revision excerpt response'
);

$this->assertArrayHasKey( 'rendered', $data['excerpt'] );
}

/**
* Test the pagination header of the last page.
*
Expand Down
Loading