Changeset 51154 for trunk/src/wp-includes/shortcodes.php

Timestamp:

06/15/2021 03:21:50 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Remove a one-time $message variable in some _doing_it_wrong() calls.

This brings some consistency with most other calls.

Follow-up to [23378], [25605], [34745], [36219], [44108], [46111], [48156].

See #52627.

File:

• trunk/src/wp-includes/shortcodes.php (modified) (2 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -65 +65 @@
 
         if ( '' === trim( $tag ) ) {
-                $message = __( 'Invalid shortcode name: Empty name given.' );
-                _doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
+                _doing_it_wrong(
+                        __FUNCTION__,
+                        __( 'Invalid shortcode name: Empty name given.' ),
+                        '4.4.0'
+                );
                 return;
         }
 
         if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20=]@', $tag ) ) {
-                /* translators: 1: Shortcode name, 2: Space-separated list of reserved characters. */
-                $message = sprintf( __( 'Invalid shortcode name: %1$s. Do not use spaces or reserved characters: %2$s' ), $tag, '& / < > [ ] =' );
-                _doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
+                _doing_it_wrong(
+                        __FUNCTION__,
+                        sprintf(
+                                /* translators: 1: Shortcode name, 2: Space-separated list of reserved characters. */
+                                __( 'Invalid shortcode name: %1$s. Do not use spaces or reserved characters: %2$s' ),
+                                $tag,
+                                '& / < > [ ] ='
+                        ),
+                        '4.4.0'
+                );
                 return;
         }
@@ -315 +325 @@
 
         if ( ! is_callable( $shortcode_tags[ $tag ] ) ) {
-                /* translators: %s: Shortcode tag. */
-                $message = sprintf( __( 'Attempting to parse a shortcode without a valid callback: %s' ), $tag );
-                _doing_it_wrong( __FUNCTION__, $message, '4.3.0' );
+                _doing_it_wrong(
+                        __FUNCTION__,
+                        /* translators: %s: Shortcode tag. */
+                        sprintf( __( 'Attempting to parse a shortcode without a valid callback: %s' ), $tag ),
+                        '4.3.0'
+                );
                 return $m[0];
         }