After [31415], make sure str_replace() only occurs once for each ma…

…tched tag to avoid overwriting until `<pre>`s.

See #31214.

Built from https://develop.svn.wordpress.org/trunk@31416


git-svn-id: http://core.svn.wordpress.org/trunk@31397 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/class-oembed.php

@@ -568,14 +568,17 @@ public function _strip_newlines( $html, $data, $url ) {
 		if ( class_exists( 'DOMDocument' ) ) {
 			$token = '__PRE__';
 			$replace = array();
+			$count = 1;
+
 			$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 );
+
+				$html = str_replace( $tag_html, $tag_token, $html, $count );
 			}
 			$pre = array_values( $replace );
 			$tokens = array_keys( $replace );

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31415';
+$wp_version = '4.2-alpha-31416';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.