Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Coding Standards: Apply various alignment corrections from `composer format`. 

This fixes a few WPCS warnings along the lines of:
* Array double arrow not aligned correctly
* Equals sign not aligned with surrounding statements
* Usage of ELSE IF is discouraged; use ELSEIF instead

Follow-up to [55099], [55192], [55194], [55271].

Props davidbaumwald, jrf, SergeyBiryukov.
Merges [55606] to the 6.2 branch.
Fixes #57994.
Built from https://develop.svn.wordpress.org/branches/6.2@55636


git-svn-id: http://core.svn.wordpress.org/branches/6.2@55148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-04-08 09:21:17 +00:00
parent fd28c6f767
commit 19e810a1cf
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/user-edit.php
View File

@ -349,7 +349,7 @@ switch ( $action ) {
</tr>
<?php
$languages = get_available_languages();
$languages = get_available_languages();
$can_install_translations = current_user_can( 'install_languages' ) && wp_can_install_language_pack();
?>
<?php if ( $languages || $can_install_translations ) : ?>
@ -370,12 +370,12 @@ switch ( $action ) {
wp_dropdown_languages(
array(
'name' => 'locale',
'id' => 'locale',
'selected' => $user_locale,
'languages' => $languages,
'name' => 'locale',
'id' => 'locale',
'selected' => $user_locale,
'languages' => $languages,
'show_available_translations' => $can_install_translations,
'show_option_site_default' => true,
'show_option_site_default' => true,
)
);
?>

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

@ -1338,9 +1338,9 @@ function get_template_hierarchy( $slug, $is_custom = false, $template_prefix = '
if ( $slug !== $type ) {
$template_hierarchy[] = $type;
}
} else if ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
} elseif ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
$template_hierarchy[] = $matches[1];
} else if ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
} elseif ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
$type = $matches[1];
$slug_remaining = $matches[2];

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

@ -272,7 +272,7 @@ class WP_REST_Global_Styles_Controller extends WP_REST_Controller {
return $changes;
}
$result = wp_update_post( wp_slash( (array) $changes ), true, false );
$result = wp_update_post( wp_slash( (array) $changes ), true, false );
if ( is_wp_error( $result ) ) {
return $result;
}

6
wp-includes/script-loader.php
View File

@ -1108,9 +1108,9 @@ function wp_default_scripts( $scripts ) {
$scripts->add( 'mediaelement-vimeo', '/wp-includes/js/mediaelement/renderers/vimeo.min.js', array( 'mediaelement' ), '4.2.17', 1 );
$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array( 'mediaelement' ), false, 1 );
$mejs_settings = array(
'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
'classPrefix' => 'mejs-',
'stretching' => 'responsive',
'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
'classPrefix' => 'mejs-',
'stretching' => 'responsive',
/** This filter is documented in wp-includes/media.php */
'audioShortcodeLibrary' => apply_filters( 'wp_audio_shortcode_library', 'mediaelement' ),
/** This filter is documented in wp-includes/media.php */

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.2.1-alpha-55635';
$wp_version = '6.2.1-alpha-55636';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.