<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36037] branches/4.4: Texturize: Transform `&` into `&` in tag attributes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36037">36037</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36037","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-21 02:45:43 +0000 (Mon, 21 Dec 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Texturize: Transform `&` into `&<a href="https://core.trac.wordpress.org/ticket/038">#038</a>;` in tag attributes.
<a href="https://core.trac.wordpress.org/changeset/35709">[35709]</a> 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.
Merge of <a href="https://core.trac.wordpress.org/changeset/36036">[36036]</a> to the 4.4 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/35008">#35008</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches44srcwpincludesformattingphp">branches/4.4/src/wp-includes/formatting.php</a></li>
<li><a href="#branches44testsphpunittestsformattingWPTexturizephp">branches/4.4/tests/phpunit/tests/formatting/WPTexturize.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches44srcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/src/wp-includes/formatting.php 2015-12-21 02:42:30 UTC (rev 36036)
+++ branches/4.4/src/wp-includes/formatting.php 2015-12-21 02:45:43 UTC (rev 36037)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,6 +233,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // This is an HTML element delimiter.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // 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 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches44testsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/tests/phpunit/tests/formatting/WPTexturize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/tests/phpunit/tests/formatting/WPTexturize.php 2015-12-21 02:42:30 UTC (rev 36036)
+++ branches/4.4/tests/phpunit/tests/formatting/WPTexturize.php 2015-12-21 02:45:43 UTC (rev 36037)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,14 +10,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_disable() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals('<pre>---</pre>', wptexturize('<pre>---</pre>'));
- $this->assertEquals('<pre><code></code>--</pre>', wptexturize('<pre><code></code>--</pre>'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals('<pre>---&</pre>', wptexturize('<pre>---&</pre>'));
+ $this->assertEquals('<pre><code></code>--&</pre>', wptexturize('<pre><code></code>--&</pre>'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '<code>---</code>', wptexturize( '<code>---</code>' ) );
- $this->assertEquals( '<kbd>---</kbd>', wptexturize( '<kbd>---</kbd>' ) );
- $this->assertEquals( '<style>---</style>', wptexturize( '<style>---</style>' ) );
- $this->assertEquals( '<script>---</script>', wptexturize( '<script>---</script>' ) );
- $this->assertEquals( '<tt>---</tt>', wptexturize( '<tt>---</tt>' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '<code>---&</code>', wptexturize( '<code>---&</code>' ) );
+ $this->assertEquals( '<kbd>---&</kbd>', wptexturize( '<kbd>---&</kbd>' ) );
+ $this->assertEquals( '<style>---&</style>', wptexturize( '<style>---&</style>' ) );
+ $this->assertEquals( '<script>---&</script>', wptexturize( '<script>---&</script>' ) );
+ $this->assertEquals( '<tt>---&</tt>', wptexturize( '<tt>---&</tt>' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('<code>href="baba"</code> “baba”', wptexturize('<code>href="baba"</code> "baba"'));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1268,13 +1268,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a> ]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a> ]',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a> ]',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a>]',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a>]',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a>]',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '& <script>&&</script>',
+ '& <script>&&</script>'
+ ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> '[gallery ...]',
</span><span class="cx" style="display: block; padding: 0 10px"> '[gallery ...]',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre>
</div>
</div>
</body>
</html>