Changeset 54319 for trunk/src/wp-includes/class-wp-embed.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/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 apply_shortcodes(), and then re-registers the old shortcodes.
+     * calls do_shortcode(), and then re-registers the old shortcodes.
      *
      * @global array $shortcode_tags
@@ -70 +70 @@
 
         // Do the shortcode (only the [embed] one is registered).
-        $content = apply_shortcodes( $content, true );
+        $content = do_shortcode( $content, true );
 
         // Put the original shortcodes back.
@@ -178 +178 @@
 
     /**
-     * The apply_shortcodes() callback function.
+     * The do_shortcode() callback function.
      *
      * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of