Changeset 33469 for trunk/src/wp-includes/class-wp-embed.php

Timestamp:

07/28/2015 11:02:04 PM (10 years ago)

Author:

wonderboymusic

Message:

Protect newlines inside of CDATA. This was breaking things, notably inline JS that used comments for HTML standards compat.

• Tokenize newlines in WP_Embed::autoembed() before running ->autoembed_callback()
• Tokenize newlines with placeholders in wpautop()
• Introduce wp_html_split() to DRY the RegEx from wp_replace_in_html_tags() and do_shortcodes_in_html_tags()

Adds unit tests.

Props miqrogroove, kitchin, azaozz.
Fixes #33106.

File:

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

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

@@ -130 +130 @@
      */
     public function shortcode( $attr, $url = '' ) {
+        // This filter can be used to output custom HTML instead of allowing oEmbed to run.
+        $custom = apply_filters( 'wp_embed_shortcode_custom', false, $attr, $url );
+        if ( false !== $custom ) {
+            return $custom;
+        }
+        
         $post = get_post();
 
@@ -319 +325 @@
      */
     public function autoembed( $content ) {
-        // Strip newlines from all elements.
-        $content = wp_replace_in_html_tags( $content, array( "\n" => " " ) );
+        // Replace line breaks from all HTML elements with placeholders.
+        $content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
 
         // Find URLs that are on their own line.
-        return preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+        $content = preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+
+        // Put the line breaks back.
+        return str_replace( '<!-- wp-line-break -->', "\n", $content );
     }