sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Texturize: Only convert & to & within text nodes.

Browse Source 
Previously, `&` would be converted everywhere, which caused problems when it was converted within a `<script>`, for example.

`convert_chars()` is now removed from the `the_content` filter, as it was doing the same job as `wptexturize()`.

KSES correctly handles converting `&` within HTML attributes, so there's no need for `wptexturize()` and `convert_chars()` to do the same job.

Fixes #34698.



git-svn-id: https://develop.svn.wordpress.org/trunk@35709 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2015-11-19 23:31:00 +00:00
parent c7e05dafbe
commit 274bb41c04
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wp-includes/default-filters.php
View File

@ -131,7 +131,6 @@ add_filter( 'the_title', 'trim' );
add_filter( 'the_content', 'wptexturize' ); add_filter( 'the_content', 'wptexturize' );
add_filter( 'the_content', 'convert_smilies' ); add_filter( 'the_content', 'convert_smilies' );
add_filter( 'the_content', 'convert_chars' );
add_filter( 'the_content', 'wpautop' ); add_filter( 'the_content', 'wpautop' );
add_filter( 'the_content', 'shortcode_unautop' ); add_filter( 'the_content', 'shortcode_unautop' );
add_filter( 'the_content', 'prepend_attachment' ); add_filter( 'the_content', 'prepend_attachment' );

7
src/wp-includes/formatting.php
View File

@ -276,12 +276,13 @@ function wptexturize( $text, $reset = false ) {
// Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one! // Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl ); $curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
} }
// Replace each & with &#038; unless it already looks like an entity.
$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
} }
} }
$text = implode( '', $textarr );
// Replace each & with &#038; unless it already looks like an entity. return implode( '', $textarr );
return preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $text );
} }
/** /**

8
tests/phpunit/tests/formatting/WPTexturize.php
View File

@ -1267,12 +1267,12 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
'[caption &#8211; is it wise to <a title="allow user content ] here? hmm"> maybe </a> ]', '[caption &#8211; is it wise to <a title="allow user content ] here? hmm"> maybe </a> ]',
), ),
array( array(
'[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a> ]', '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a> ]',
'[ photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy </a> ]', '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy &#038; that guy </a> ]',
), ),
array( array(
'[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a>]', '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a>]',
'[photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy </a>]', '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy &#038; that guy </a>]',
), ),
array( array(
'[gallery ...]', '[gallery ...]',