Changeset 54248 for trunk/src/wp-includes/class-wp-embed.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/class-wp-embed.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-embed.php

@@ -53 +53 @@
      * Since the [embed] shortcode needs to be run earlier than other shortcodes,
      * this function removes all existing shortcodes, registers the [embed] shortcode,
-     * calls do_shortcode(), and then re-registers the old shortcodes.
+     * calls apply_shortcodes(), and then re-registers the old shortcodes.
      *
      * @global array $shortcode_tags
@@ -70 +70 @@
 
         // Do the shortcode (only the [embed] one is registered).
-        $content = do_shortcode( $content, true );
+        $content = apply_shortcodes( $content, true );
 
         // Put the original shortcodes back.
@@ -178 +178 @@
 
     /**
-     * The do_shortcode() callback function.
+     * The apply_shortcodes() callback function.
      *
      * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of