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

Texturize: Transform & into & in tag attributes.

Browse Source 
[35709] was overly broad, and stopped transforming `&` characters within tag attributes. So that sites aren't generating invalid HTML, we need to restore this functionality, while continuing to not transform `&` within blocked tags.

Fixes #35008 for trunk.



git-svn-id: https://develop.svn.wordpress.org/trunk@36036 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2015-12-21 02:42:30 +00:00
parent d6bf586de3
commit 59b8f0da7c
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,6 +233,10 @@ function wptexturize( $text, $reset = false ) {
continue; continue;
} else { } else {
// This is an HTML element delimiter. // This is an HTML element delimiter.
// Replace each & with & unless it already looks like an entity.
$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&', $curl );
_wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags ); _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
} }

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

@ -10,14 +10,14 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
} }
function test_disable() { function test_disable() {
$this->assertEquals('<pre>---</pre>', wptexturize('<pre>---</pre>')); $this->assertEquals('<pre>---&</pre>', wptexturize('<pre>---&</pre>'));
$this->assertEquals('<pre><code></code>--</pre>', wptexturize('<pre><code></code>--</pre>')); $this->assertEquals('<pre><code></code>--&</pre>', wptexturize('<pre><code></code>--&</pre>'));
$this->assertEquals( '<code>---</code>', wptexturize( '<code>---</code>' ) ); $this->assertEquals( '<code>---&</code>', wptexturize( '<code>---&</code>' ) );
$this->assertEquals( '<kbd>---</kbd>', wptexturize( '<kbd>---</kbd>' ) ); $this->assertEquals( '<kbd>---&</kbd>', wptexturize( '<kbd>---&</kbd>' ) );
$this->assertEquals( '<style>---</style>', wptexturize( '<style>---</style>' ) ); $this->assertEquals( '<style>---&</style>', wptexturize( '<style>---&</style>' ) );
$this->assertEquals( '<script>---</script>', wptexturize( '<script>---</script>' ) ); $this->assertEquals( '<script>---&</script>', wptexturize( '<script>---&</script>' ) );
$this->assertEquals( '<tt>---</tt>', wptexturize( '<tt>---</tt>' ) ); $this->assertEquals( '<tt>---&</tt>', wptexturize( '<tt>---&</tt>' ) );
$this->assertEquals('<code>href="baba"</code> &#8220;baba&#8221;', wptexturize('<code>href="baba"</code> "baba"')); $this->assertEquals('<code>href="baba"</code> &#8220;baba&#8221;', wptexturize('<code>href="baba"</code> "baba"'));
@ -1268,11 +1268,15 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
), ),
array( array(
'[ 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&a[]=2"> this guy & that guy </a> ]',
'[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy &#038; that guy </a> ]', '[ photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy &#038; that guy </a> ]',
), ),
array( array(
'[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&a[]=2"> this guy & that guy </a>]',
'[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy &#038; that guy </a>]', '[photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy &#038; that guy </a>]',
),
array(
'& <script>&&</script>',
'&#038; <script>&&</script>'
), ),
array( array(
'[gallery ...]', '[gallery ...]',