Changeset 33522 for branches/4.0/src/wp-includes/class-wp-embed.php

Timestamp:

07/31/2015 01:43:11 AM (11 years ago)

Author:

azaozz

Message:

Backport r33469 and r33470 to 4.0.
See #33106.

File:

• branches/4.0/src/wp-includes/class-wp-embed.php (modified) (1 diff)

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

@@ -327 +327 @@
          */
         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 );
         }