Changeset 42690

Timestamp:

02/11/2018 02:16:43 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Media: Convert concatenation in img_caption_shortcode() to sprintf() for clarity.

See #34595.

File:

• trunk/src/wp-includes/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -1590 +1590 @@
 
         if ( $html5 ) {
-                $html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-                . do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+                $html = sprintf(
+                        '<figure %s%sclass="%s">%s%s</figure>',
+                        $atts['id'],
+                        $style,
+                        esc_attr( $class ),
+                        do_shortcode( $content ),
+                        sprintf(
+                                '<figcaption class="wp-caption-text">%s</figcaption>',
+                                $atts['caption']
+                        )
+                );
         } else {
-                $html = '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-                . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+                $html = sprintf(
+                        '<div %s%sclass="%s">%s%s</div>',
+                        $atts['id'],
+                        $style,
+                        esc_attr( $class ),
+                        do_shortcode( $content ),
+                        sprintf(
+                                '<p class="wp-caption-text">%s</p>',
+                                $atts['caption']
+                        )
+                );
         }