Changeset 33386 for branches/3.9/src/wp-includes/class-wp-embed.php

Timestamp:

07/23/2015 05:00:44 AM (11 years ago)

Author:

pento

Message:

Shortcodes: Improve the reliablity of shortcodes inside HTML tags.

Merge of [33359] to the 3.9 branch.

Props miqrogroove.

See #15694.

File:

• branches/3.9/src/wp-includes/class-wp-embed.php (modified) (2 diffs)

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

@@ -58 +58 @@
 
                 // Do the shortcode (only the [embed] one is registered)
-                $content = do_shortcode( $content );
+                $content = do_shortcode( $content, true );
 
                 // Put the original shortcodes back
@@ -292 +292 @@
          */
         function autoembed( $content ) {
+                // Strip newlines from all elements.
+                $content = wp_replace_in_html_tags( $content, array( "\n" => " " ) );
+
+                // Find URLs that are on their own line.
                 return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
         }