Ticket #25820: 25820.diff

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

@@ -56 +56 @@
 
                 add_shortcode( 'embed', array( $this, 'shortcode' ) );
 
+                add_filter( 'escaped_shortcode', array( $this, 'reescape' ) );
+
                 // Do the shortcode (only the [embed] one is registered)
                 $content = do_shortcode( $content );
 
+                remove_filter( 'escaped_shortcode', array( $this, 'reescape' ) );
+
                 // Put the original shortcodes back
                 $shortcode_tags = $orig_shortcode_tags;
 
@@ -66 +70 @@
         }
 
         /**
+         * Processing the embed shortcode early causes escaped shortcodes to become
+         * real shortcodes, so let's re-escape them
+         */
+        public function reescape( $shortcode ) {
+                return "[$shortcode]";
+        }
+
+        /**
          * If a post/page was saved, then output JavaScript to make
          * an AJAX request that will call WP_Embed::cache_oembed().
          */

src/wp-includes/shortcodes.php

@@ -278 +278 @@
 
         // allow [[foo]] syntax for escaping a tag
         if ( $m[1] == '[' && $m[6] == ']' ) {
-                return substr($m[0], 1, -1);
+                /**
+                 * Filter an escaped shortcode
+                 *
+                 * @since 4.1.0
+                 *
+                 * @param string $shortcode The now-unescaped shortode string
+                 */
+                return apply_filters( 'escaped_shortcode', substr($m[0], 1, -1) );
         }
 
         $tag = $m[2];