Commit f940bc822d for wordpress.org
commit f940bc822d8aa34802a99c60c44d694c7eb58d1b
Author: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed Mar 29 07:13:23 2023 +0000
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.
Fixes #57994.
Built from https://develop.svn.wordpress.org/trunk@55606
git-svn-id: http://core.svn.wordpress.org/trunk@55118 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 79e7b49800..2f1c468b53 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -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,
)
);
?>
diff --git a/wp-includes/block-template-utils.php b/wp-includes/block-template-utils.php
index 915c65c0dd..cf0c4af12e 100644
--- a/wp-includes/block-template-utils.php
+++ b/wp-includes/block-template-utils.php
@@ -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];
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
index c8eee60ed3..9d463cd9e4 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
@@ -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;
}
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 946fc60b7d..cd84a19f6c 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -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 */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 788eb4de92..cf15f8da42 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '6.3-alpha-55601';
+$wp_version = '6.3-alpha-55606';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.