Changeset 54319 for trunk/src/wp-includes/media.php

Timestamp:

09/26/2022 10:41:11 PM (2 years ago)

Author:

davidbaumwald

Message:

Shortcodes: Revert recent apply_shortcodes and do_shortcode changes.

[54248] reversed the wrapping of do_shortcode and apply_shortcodes and updated all direct internal calls of do_shortcode to apply_shortcodes after [47004]. After further consideration, the long history of do_shortcodes should be favored over any subjective semantic improvements. This change reverts the remaining changes from #55883 not already reverted in [54278].

Follow-up to [47004], [54248], and [54278].

Props azaozz, jorbin.
See #55883.

File:

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

trunk/src/wp-includes/media.php

@@ -2297 +2297 @@
             $style,
             esc_attr( $class ),
-            apply_shortcodes( $content ),
+            do_shortcode( $content ),
             sprintf(
                 '<figcaption %sclass="wp-caption-text">%s</figcaption>',
@@ -2310 +2310 @@
             $style,
             esc_attr( $class ),
-            str_replace( '<img ', '<img ' . $describedby, apply_shortcodes( $content ) ),
+            str_replace( '<img ', '<img ' . $describedby, do_shortcode( $content ) ),
             sprintf(
                 '<p %sclass="wp-caption-text">%s</p>',