Changeset 54753 for branches/6.1

Timestamp:

11/05/2022 09:59:35 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Revert [54752] from the 6.1 branch.

This was supposed to be committed to trunk.

See #56791.

Location:

branches/6.1/src/wp-includes

Files:

• block-template-utils.php (modified) (4 diffs)
• class-wp-oembed.php (modified) (1 diff)
• functions.php (modified) (2 diffs)
• rest-api/endpoints/class-wp-rest-posts-controller.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

branches/6.1/src/wp-includes/block-template-utils.php

@@ -557 +557 @@
         );
 
-        $args = array(
+        $args  = array(
                 'name' => $slug,
         );
-        $args = wp_parse_args( $args, $default_args );
-
+        $args  = wp_parse_args( $args, $default_args );
         $posts_query = new WP_Query( $args );
 
@@ -593 +592 @@
                 'title' => $post_title,
         );
-        $args = wp_parse_args( $args, $default_args );
-
+        $args                        = wp_parse_args( $args, $default_args );
         $posts_with_same_title_query = new WP_Query( $args );
 
@@ -633 +631 @@
         $term_query = new WP_Term_Query();
 
-        $args = array(
+        $args  = array(
                 'number' => 1,
                 'slug'   => $slug,
         );
-        $args = wp_parse_args( $args, $default_args );
-
+        $args        = wp_parse_args( $args, $default_args );
         $terms_query = $term_query->query( $args );
 
@@ -672 +669 @@
                 'name'   => $term_title,
         );
-        $args = wp_parse_args( $args, $default_args );
-
+        $args                        = wp_parse_args( $args, $default_args );
         $terms_with_same_title_query = $term_query->query( $args );
 

branches/6.1/src/wp-includes/class-wp-oembed.php

@@ -81 +81 @@
                         '#https?://(www\.|embed\.)?ted\.com/talks/.*#i' => array( 'https://www.ted.com/services/v1/oembed.{format}', true ),
                         '#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'https://animoto.com/oembeds/create', true ),
-                        '#https?://(.+)\.tumblr\.com/.*#i'             => array( 'https://www.tumblr.com/oembed/1.0', true ),
+                        '#https?://(.+)\.tumblr\.com/.*#i'        => array( 'https://www.tumblr.com/oembed/1.0', true ),
                         '#https?://(www\.)?kickstarter\.com/projects/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ),
                         '#https?://kck\.st/.*#i'                       => array( 'https://www.kickstarter.com/services/oembed', true ),

branches/6.1/src/wp-includes/functions.php

@@ -3568 +3568 @@
                         get_bloginfo( 'name' )
                 );
-
+                $html        = $title;
+                $html       .= '</p><p>';
                 $redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-
-                $html  = $title;
-                $html .= '</p><p>';
-                $html .= sprintf(
+                $html       .= sprintf(
                         /* translators: %s: Logout URL. */
                         __( 'Do you really want to <a href="%s">log out</a>?' ),
@@ -3580 +3578 @@
         } else {
                 $html = __( 'The link you followed has expired.' );
-
                 if ( wp_get_referer() ) {
                         $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
                         $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
-
                         $html .= '</p><p>';
                         $html .= sprintf(

branches/6.1/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -2891 +2891 @@
 
                 $query_params['slug'] = array(
-                        'description' => __( 'Limit result set to posts with one or more specific slugs.' ),
-                        'type'        => 'array',
-                        'items'       => array(
+                        'description'       => __( 'Limit result set to posts with one or more specific slugs.' ),
+                        'type'              => 'array',
+                        'items'             => array(
                                 'type' => 'string',
                         ),

branches/6.1/src/wp-includes/script-loader.php

@@ -3687 +3687 @@
                 return $editor_settings;
         }
-
-        $suffix               = wp_scripts_get_suffix();
+        $suffix = wp_scripts_get_suffix();
         $classic_theme_styles = ABSPATH . WPINC . "/css/classic-themes$suffix.css";