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

Timestamp:

09/20/2022 10:29:55 AM (2 years ago)

Author:

audrasjb

Message:

Shortcodes: Reverse wrapping of apply_shortcodes() and do_shortcode().

This changeset reverses the wrapping of apply_shortcodes() and do_shortcode() such that apply_shortcodes() is now the recommended function. In addition:

• Calls to do_shortcode() have been changed to apply_shortcodes().
• Some default filter callbacks have been changed from 'do_shortcode' to 'apply_shortcodes'.
• Applicable documentation has been updated to refer to apply_shortcodes() instead.

Follow-up to [47004].

Props SergeyBiryukov, rafiahmedd, namithjawahar, peterwilsoncc, costdev.
Fixes #55883.

File:

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

trunk/src/wp-includes/media.php

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