Changeset 54319 for trunk/src/wp-includes/shortcodes.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/shortcodes.php (modified) (6 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -22 +22 @@
  * To apply shortcode tags to content:
  *
- *     $out = apply_shortcodes( $content );
+ *     $out = do_shortcode( $content );
  *
  * @link https://developer.wordpress.org/plugins/shortcodes/
@@ -172 +172 @@
  * Searches content for shortcodes and filter shortcodes through their hooks.
  *
- * If there are no shortcode tags defined, then the content will be returned
- * without any filtering. This might cause issues when plugins are disabled but
- * the shortcode will still show up in the post or content.
+ * This function is an alias for do_shortcode().
  *
  * @since 5.4.0
  *
- * @global array $shortcode_tags List of shortcode tags and their callback hooks.
+ * @see do_shortcode()
  *
  * @param string $content     Content to search for shortcodes.
@@ -186 +184 @@
  */
 function apply_shortcodes( $content, $ignore_html = false ) {
-    global $shortcode_tags;
-
-    if ( false === strpos( $content, '[' ) ) {
-        return $content;
-    }
-
-    if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
-        return $content;
-    }
-
-    // Find all registered tag names in $content.
-    preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
-    $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
-
-    if ( empty( $tagnames ) ) {
-        return $content;
-    }
-
-    $content = do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames );
-
-    $pattern = get_shortcode_regex( $tagnames );
-    $content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $content );
-
-    // Always restore square braces so we don't break things like <!--[if IE ]>.
-    $content = unescape_invalid_shortcodes( $content );
-
-    return $content;
+    return do_shortcode( $content, $ignore_html );
 }
 
@@ -218 +190 @@
  * Searches content for shortcodes and filter shortcodes through their hooks.
  *
- * This function is an alias for apply_shortcodes().
- *
- * @since 2.5.0
- *
- * @see apply_shortcodes()
+ * If there are no shortcode tags defined, then the content will be returned
+ * without any filtering. This might cause issues when plugins are disabled but
+ * the shortcode will still show up in the post or content.
+ *
+ * @since 2.5.0
+ *
+ * @global array $shortcode_tags List of shortcode tags and their callback hooks.
  *
  * @param string $content     Content to search for shortcodes.
@@ -230 +204 @@
  */
 function do_shortcode( $content, $ignore_html = false ) {
-    return apply_shortcodes( $content, $ignore_html );
+    global $shortcode_tags;
+
+    if ( false === strpos( $content, '[' ) ) {
+        return $content;
+    }
+
+    if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
+        return $content;
+    }
+
+    // Find all registered tag names in $content.
+    preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
+    $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
+
+    if ( empty( $tagnames ) ) {
+        return $content;
+    }
+
+    $content = do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames );
+
+    $pattern = get_shortcode_regex( $tagnames );
+    $content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $content );
+
+    // Always restore square braces so we don't break things like <!--[if IE ]>.
+    $content = unescape_invalid_shortcodes( $content );
+
+    return $content;
 }
 
@@ -300 +300 @@
 
 /**
- * Regular Expression callable for apply_shortcodes() for calling shortcode hook.
+ * Regular Expression callable for do_shortcode() for calling shortcode hook.
  *
  * @see get_shortcode_regex() for details of the match array contents.