Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 15:31:42 +01:00
Code Issues Projects Releases Wiki Activity

Coding Standards: Correct alignment in blocks.php and class-wp-rest-templates-controller.

Browse Source 
See #53359.

Built from https://develop.svn.wordpress.org/trunk@52345


git-svn-id: http://core.svn.wordpress.org/trunk@51937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2021-12-07 22:49:59 +00:00
parent abed17b03d
commit 12369a6425
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/blocks.php
View File

@ -103,9 +103,9 @@ function register_block_script_handle( $metadata, $field_name ) {
return false; return false;
} }
// Path needs to be normalized to work in Windows env. // Path needs to be normalized to work in Windows env.
$wpinc_path_norm = wp_normalize_path( ABSPATH . WPINC ); $wpinc_path_norm = wp_normalize_path( ABSPATH . WPINC );
$script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) ); $script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) );
$is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm ); $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm );
$script_uri = $is_core_block ? $script_uri = $is_core_block ?
includes_url( str_replace( $wpinc_path_norm, '', $script_path_norm ) ) : includes_url( str_replace( $wpinc_path_norm, '', $script_path_norm ) ) :

4
wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
View File

@ -342,7 +342,7 @@ class WP_REST_Templates_Controller extends WP_REST_Controller {
* @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure. * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
*/ */
public function create_item( $request ) { public function create_item( $request ) {
$prepared_post = $this->prepare_item_for_database( $request ); $prepared_post = $this->prepare_item_for_database( $request );
if ( is_wp_error( $prepared_post ) ) { if ( is_wp_error( $prepared_post ) ) {
return $prepared_post; return $prepared_post;
@ -857,7 +857,7 @@ class WP_REST_Templates_Controller extends WP_REST_Controller {
'context' => array( 'embed', 'view', 'edit' ), 'context' => array( 'embed', 'view', 'edit' ),
'readonly' => true, 'readonly' => true,
), ),
'author' => array( 'author' => array(
'description' => __( 'The ID for the author of the template.' ), 'description' => __( 'The ID for the author of the template.' ),
'type' => 'integer', 'type' => 'integer',
'context' => array( 'view', 'edit', 'embed' ), 'context' => array( 'view', 'edit', 'embed' ),

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.9-beta2-52344'; $wp_version = '5.9-beta2-52345';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.