Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

After [31415], make sure `str_replace()` only occurs once for each matched 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
This commit is contained in:
Scott Taylor 2015-02-11 19:15:26 +00:00
parent cb3ef90d24
commit a7e581d991
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/class-oembed.php
View File

@ -568,6 +568,8 @@ class WP_oEmbed {
if ( class_exists( 'DOMDocument' ) ) {
$token = '__PRE__';
$replace = array();
$count = 1;
$dom = new DOMDocument();
$dom->loadHTML( $html );
$tags = $dom->getElementsByTagName( 'pre' );
@ -575,7 +577,8 @@ class WP_oEmbed {
$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 );

2
wp-includes/version.php
View File

@ -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.