Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Coding Standards: Correct alignment in various files.

Browse Source 
This fixes an `Array double arrow not aligned correctly` WPCS warning.

Follow-up to [53075], [53084], [53091], [53094], [53155], [53129].

See #54728.
Built from https://develop.svn.wordpress.org/trunk@53197


git-svn-id: http://core.svn.wordpress.org/trunk@52786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-04-17 15:07:08 +00:00
parent 8a6d7ea5ac
commit e0d13f8b59
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/edit-form-blocks.php
View File

@ -57,7 +57,7 @@ $preload_paths = array(
'/wp/v2/taxonomies?context=view', '/wp/v2/taxonomies?context=view',
add_query_arg( add_query_arg(
array( array(
'context' => 'edit', 'context' => 'edit',
'per_page' => -1, 'per_page' => -1,
), ),
rest_get_route_for_post_type_items( 'wp_block' ) rest_get_route_for_post_type_items( 'wp_block' )
@ -188,25 +188,25 @@ if ( $user_id ) {
$body_placeholder = apply_filters( 'write_your_story', __( 'Type / to choose a block' ), $post ); $body_placeholder = apply_filters( 'write_your_story', __( 'Type / to choose a block' ), $post );
$editor_settings = array( $editor_settings = array(
'availableTemplates' => $available_templates, 'availableTemplates' => $available_templates,
'disablePostFormats' => ! current_theme_supports( 'post-formats' ), 'disablePostFormats' => ! current_theme_supports( 'post-formats' ),
/** This filter is documented in wp-admin/edit-form-advanced.php */ /** This filter is documented in wp-admin/edit-form-advanced.php */
'titlePlaceholder' => apply_filters( 'enter_title_here', __( 'Add title' ), $post ), 'titlePlaceholder' => apply_filters( 'enter_title_here', __( 'Add title' ), $post ),
'bodyPlaceholder' => $body_placeholder, 'bodyPlaceholder' => $body_placeholder,
'autosaveInterval' => AUTOSAVE_INTERVAL, 'autosaveInterval' => AUTOSAVE_INTERVAL,
'richEditingEnabled' => user_can_richedit(), 'richEditingEnabled' => user_can_richedit(),
'postLock' => $lock_details, 'postLock' => $lock_details,
'postLockUtils' => array( 'postLockUtils' => array(
'nonce' => wp_create_nonce( 'lock-post_' . $post->ID ), 'nonce' => wp_create_nonce( 'lock-post_' . $post->ID ),
'unlockNonce' => wp_create_nonce( 'update-post_' . $post->ID ), 'unlockNonce' => wp_create_nonce( 'update-post_' . $post->ID ),
'ajaxUrl' => admin_url( 'admin-ajax.php' ), 'ajaxUrl' => admin_url( 'admin-ajax.php' ),
), ),
'supportsLayout' => WP_Theme_JSON_Resolver::theme_has_support(), 'supportsLayout' => WP_Theme_JSON_Resolver::theme_has_support(),
'supportsTemplateMode' => current_theme_supports( 'block-templates' ), 'supportsTemplateMode' => current_theme_supports( 'block-templates' ),
// Whether or not to load the 'postcustom' meta box is stored as a user meta // Whether or not to load the 'postcustom' meta box is stored as a user meta
// field so that we're not always loading its assets. // field so that we're not always loading its assets.
'enableCustomFields' => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ), 'enableCustomFields' => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
); );
$autosave = wp_get_post_autosave( $post->ID ); $autosave = wp_get_post_autosave( $post->ID );

12
wp-admin/site-editor.php
View File

@ -61,12 +61,12 @@ foreach ( get_default_block_template_types() as $slug => $template_type ) {
$block_editor_context = new WP_Block_Editor_Context( array( 'name' => 'core/edit-site' ) ); $block_editor_context = new WP_Block_Editor_Context( array( 'name' => 'core/edit-site' ) );
$custom_settings = array( $custom_settings = array(
'siteUrl' => site_url(), 'siteUrl' => site_url(),
'postsPerPage' => get_option( 'posts_per_page' ), 'postsPerPage' => get_option( 'posts_per_page' ),
'styles' => get_block_editor_theme_styles(), 'styles' => get_block_editor_theme_styles(),
'defaultTemplateTypes' => $indexed_template_types, 'defaultTemplateTypes' => $indexed_template_types,
'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(), 'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(),
'__unstableHomeTemplate' => $home_template, '__unstableHomeTemplate' => $home_template,
); );
$editor_settings = get_block_editor_settings( $custom_settings, $block_editor_context ); $editor_settings = get_block_editor_settings( $custom_settings, $block_editor_context );

4
wp-includes/block-template-utils.php
View File

@ -1001,8 +1001,8 @@ function wp_generate_block_templates_export_file() {
if ( $theme_json_raw['version'] ) { if ( $theme_json_raw['version'] ) {
global $wp_version; global $wp_version;
$theme_json_version = 'wp/' . substr( $wp_version, 0, 3 ); $theme_json_version = 'wp/' . substr( $wp_version, 0, 3 );
$schema = array( '$schema' => 'https://schemas.wp.org/' . $theme_json_version . '/theme.json' ); $schema = array( '$schema' => 'https://schemas.wp.org/' . $theme_json_version . '/theme.json' );
$theme_json_raw = array_merge( $schema, $theme_json_raw ); $theme_json_raw = array_merge( $schema, $theme_json_raw );
} }
// Convert to a string. // Convert to a string.

2
wp-includes/blocks.php
View File

@ -1362,7 +1362,7 @@ function _wp_multiple_block_styles( $metadata ) {
$style_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $style_path_norm ) ); $style_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $style_path_norm ) );
} }
$args = array( $args = array(
'handle' => sanitize_key( "{$metadata['name']}-{$style_path}" ), 'handle' => sanitize_key( "{$metadata['name']}-{$style_path}" ),
'src' => $style_uri, 'src' => $style_uri,
); );

2
wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
View File

@ -646,7 +646,7 @@ class WP_REST_Block_Types_Controller extends WP_REST_Controller {
'context' => array( 'embed', 'view', 'edit' ), 'context' => array( 'embed', 'view', 'edit' ),
'readonly' => true, 'readonly' => true,
), ),
'ancestor' => array( 'ancestor' => array(
'description' => __( 'Ancestor blocks.' ), 'description' => __( 'Ancestor blocks.' ),
'type' => array( 'array', 'null' ), 'type' => array( 'array', 'null' ),
'items' => array( 'items' => array(

2
wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
View File

@ -581,7 +581,7 @@ class WP_REST_Global_Styles_Controller extends WP_REST_Controller {
} }
if ( rest_is_field_included( 'styles', $fields ) ) { if ( rest_is_field_included( 'styles', $fields ) ) {
$raw_data = $theme->get_raw_data(); $raw_data = $theme->get_raw_data();
$data['styles'] = isset( $raw_data['styles'] ) ? $raw_data['styles'] : array(); $data['styles'] = isset( $raw_data['styles'] ) ? $raw_data['styles'] : array();
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-beta1-53196'; $wp_version = '6.0-beta1-53197';
/** /**
* 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.