vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-06 01:10:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Editor: Avoid undefined index notices in the Template Parts Editor.

Browse Source 
This changes adds a leading slash when needed in the `?context=edit` path to avoid an `undefined index` notice in the Template Parts Editor.

Follow-up to [52275].

Props kafleg, costdev, mukesh27, Boniu91.
Fixes #54558.


git-svn-id: https://develop.svn.wordpress.org/trunk@52312 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras
2021-12-03 15:28:21 +00:00
parent 1270c897a9
commit 108e65819a
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wp-includes/block-editor.php
View File

@@ -468,6 +468,17 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont
*/
$backup_global_post = ! empty( $post ) ? clone $post : $post;
foreach ( $preload_paths as &$path ) {
if ( is_string( $path ) && ! str_starts_with( $path, '/' ) ) {
$path = '/' . $path;
continue;
}
if ( is_array( $path ) && is_string( $path[0] ) && ! str_starts_with( $path[0], '/' ) ) {
$path[0] = '/' . $path[0];
}
}
$preload_data = array_reduce(
$preload_paths,
'rest_preload_api_request',

49
tests/phpunit/tests/blocks/editor.php
View File

@@ -493,4 +493,53 @@ class Tests_Blocks_Editor extends WP_UnitTestCase {
$this->assertStringContainsString( '"\/wp\/v2\/blocks"', $after );
$this->assertStringContainsString( '"\/wp\/v2\/types"', $after );
}
/**
* @ticket 54558
* @dataProvider data_block_editor_rest_api_preload_adds_missing_leading_slash
*
* @covers ::block_editor_rest_api_preload
*
* @param array $preload_paths The paths to preload.
* @param string $expected The expected substring.
*/
public function test_block_editor_rest_api_preload_adds_missing_leading_slash( array $preload_paths, $expected ) {
block_editor_rest_api_preload( $preload_paths, new WP_Block_Editor_Context() );
$haystack = implode( '', wp_scripts()->registered['wp-api-fetch']->extra['after'] );
$this->assertStringContainsString( $expected, $haystack );
}
/**
* Data provider.
*
* @return array
*/
public function data_block_editor_rest_api_preload_adds_missing_leading_slash() {
return array(
'a string without a slash' => array(
'preload_paths' => array( 'wp/v2/blocks' ),
'expected' => '\/wp\/v2\/blocks',
),
'a string with a slash' => array(
'preload_paths' => array( '/wp/v2/blocks' ),
'expected' => '\/wp\/v2\/blocks',
),
'a string starting with a question mark' => array(
'preload_paths' => array( '?context=edit' ),
'expected' => '/?context=edit',
),
'an array with a string without a slash' => array(
'preload_paths' => array( array( 'wp/v2/blocks', 'OPTIONS' ) ),
'expected' => '\/wp\/v2\/blocks',
),
'an array with a string with a slash' => array(
'preload_paths' => array( array( '/wp/v2/blocks', 'OPTIONS' ) ),
'expected' => '\/wp\/v2\/blocks',
),
'an array with a string starting with a question mark' => array(
'preload_paths' => array( array( '?context=edit', 'OPTIONS' ) ),
'expected' => '\/?context=edit',
),
);
}
}