Ticket #37422: 37422.patch

wp-admin/includes/ajax-actions.php

@@ -2980 +2980 @@
                         $styles .= sprintf( '<link rel="stylesheet" href="%s"/>', $style );
                 }
 
-                $html = apply_shortcodes( $parsed );
+                $html = do_shortcode( $parsed );
 
                 global $wp_scripts;
                 if ( ! empty( $wp_scripts ) ) {
@@ -3037 +3037 @@
                 setup_postdata( $post );
         }
 
-        $parsed = apply_shortcodes( $shortcode  );
+        $parsed = do_shortcode( $shortcode  );
 
         if ( empty( $parsed ) ) {
                 wp_send_json_error( array(

wp-includes/class-wp-embed.php

@@ -48 +48 @@
          *
          * 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
          *
@@ -65 +65 @@
                 add_shortcode( 'embed', array( $this, 'shortcode' ) );
 
                 // Do the shortcode (only the [embed] one is registered)
-                $content = apply_shortcodes( $content, true );
+                $content = do_shortcode( $content, true );
 
                 // Put the original shortcodes back
                 $shortcode_tags = $orig_shortcode_tags;
@@ -124 +124 @@
         }
 
         /**
-         * The allby_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
          * the registered embed handlers. If none of the regex matches and it's enabled, then the URL

wp-includes/default-filters.php

@@ -430 +430 @@
 add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
 
 // Shortcodes
-add_filter( 'the_content', 'apply_shortcodes', 11 ); // AFTER wpautop()
+add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop()
 
 // Media
 add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );

wp-includes/deprecated.php

@@ -3758 +3758 @@
 
         return '';
 }
-
-/**
- * Search 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.
- *
- * @since 2.5.0
- *
- * @global array $shortcode_tags List of shortcode tags and their callback hooks.
- *
- * @param string $content Content to search for shortcodes.
- * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
- * @return string Content with shortcodes filtered out.
- */
-function do_shortcode( $content, $ignore_html = false ) {
-        _deprecated_function( __FUNCTION__, '4.7.0', 'apply_shortcodes' );
-
-        return apply_shortcodes( $content, $ignore_html );
-}
- No newline at end of file

wp-includes/media.php

@@ -1571 +1571 @@
 
         if ( $html5 ) {
                 $html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-                . apply_shortcodes( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+                . do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
         } else {
                 $html = '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-                . apply_shortcodes( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+                . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
         }
 
         return $html;

wp-includes/shortcodes.php

@@ -21 +21 @@
  *
  * To apply shortcode tags to content:
  *
- *     $out = apply_shortcodes( $content );
+ *     $out = do_shortcode( $content );
  *
  * @link https://codex.wordpress.org/Shortcode_API
  *
@@ -199 +199 @@
  * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
  * @return string Content with shortcodes filtered out.
  */
-function apply_shortcodes( $content, $ignore_html = false ) {
+function do_shortcode( $content, $ignore_html = false ) {
         global $shortcode_tags;
 
         if ( false === strpos( $content, '[' ) ) {
@@ -292 +292 @@
 }
 
 /**
- * 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.
  *
  * @since 2.5.0