Changeset 31415 for trunk/src/wp-includes/class-oembed.php

Timestamp:

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

Author:

wonderboymusic

Message:

Protect <pre> tags when parsing oEmbed responses in WP_oEmbed::_strip_newlines() in DOMDocument is available.

Fixes #31214.

File:

• trunk/src/wp-includes/class-oembed.php (modified) (1 diff)

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

@@ -560 +560 @@
      */
     public function _strip_newlines( $html, $data, $url ) {
-        if ( false !== strpos( $html, "\n" ) )
-            $html = str_replace( array( "\r\n", "\n" ), '', $html );
-
-        return $html;
+        if ( false === strpos( $html, "\n" ) ) {
+            return $html;
+        }
+
+        $pre = array();
+        $tokens = array();
+        if ( class_exists( 'DOMDocument' ) ) {
+            $token = '__PRE__';
+            $replace = array();
+            $dom = new DOMDocument();
+            $dom->loadHTML( $html );
+            $tags = $dom->getElementsByTagName( 'pre' );
+            foreach ( $tags as $i => $tag ) {
+                $tag_html = $dom->saveHTML( $tag );
+                $tag_token = $token . $i;
+                $replace[ $tag_token ] = $tag_html;
+                $html = str_replace( $tag_html, $tag_token, $html );
+            }
+            $pre = array_values( $replace );
+            $tokens = array_keys( $replace );
+        }
+
+        $stripped = str_replace( array( "\r\n", "\n" ), '', $html );
+        return str_replace( $tokens, $pre, $stripped );
     }
 }