<!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>[26052] trunk: Don't convert URLs inside `<pre>` and `<code>` tags when parsing string using `make_clickable()`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26052">26052</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-11-08 22:37:41 +0000 (Fri, 08 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't convert URLs inside `<pre>` and `<code>` tags when parsing string using `make_clickable()`.
Adds Unit Tests.
Props johnjamesjacoby, helen, nacin, adamsilverstein, sirbrillig.
Fixes <a href="http://core.trac.wordpress.org/ticket/23756">#23756</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsformattingMakeClickablephp">trunk/tests/phpunit/tests/formatting/MakeClickable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (26051 => 26052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2013-11-08 22:23:58 UTC (rev 26051)
+++ trunk/src/wp-includes/formatting.php 2013-11-08 22:37:41 UTC (rev 26052)
</span><span class="lines">@@ -1606,8 +1606,15 @@
</span><span class="cx"> function make_clickable( $text ) {
</span><span class="cx"> $r = '';
</span><span class="cx"> $textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
</span><ins>+ $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
</ins><span class="cx"> foreach ( $textarr as $piece ) {
</span><del>- if ( empty( $piece ) || ( $piece[0] == '<' && ! preg_match('|^<\s*[\w]{1,20}+://|', $piece) ) ) {
</del><ins>+
+ if ( preg_match( '|^<code[\s>]|', $piece ) || preg_match( '|^<pre[\s>]|', $piece ) )
+ $nested_code_pre++;
+ elseif ( ( '</code>' === $piece || '</pre>' === $piece ) && $nested_code_pre )
+ $nested_code_pre--;
+
+ if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
</ins><span class="cx"> $r .= $piece;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingMakeClickablephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/MakeClickable.php (26051 => 26052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/MakeClickable.php 2013-11-08 22:23:58 UTC (rev 26051)
+++ trunk/tests/phpunit/tests/formatting/MakeClickable.php 2013-11-08 22:37:41 UTC (rev 26052)
</span><span class="lines">@@ -289,6 +289,46 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * @ticket 23756
+ */
+ function test_no_links_inside_pre_or_code() {
+ $before = array(
+ '<pre>http://wordpress.org</pre>',
+ '<code>http://wordpress.org</code>',
+ '<pre class="foobar" id="foo">http://wordpress.org</pre>',
+ '<code class="foobar" id="foo">http://wordpress.org</code>',
+ '<precustomtag>http://wordpress.org</precustomtag>',
+ '<codecustomtag>http://wordpress.org</codecustomtag>',
+ 'URL before pre http://wordpress.org<pre>http://wordpress.org</pre>',
+ 'URL before code http://wordpress.org<code>http://wordpress.org</code>',
+ 'URL after pre <pre>http://wordpress.org</pre>http://wordpress.org',
+ 'URL after code <code>http://wordpress.org</code>http://wordpress.org',
+ 'URL before and after pre http://wordpress.org<pre>http://wordpress.org</pre>http://wordpress.org',
+ 'URL before and after code http://wordpress.org<code>http://wordpress.org</code>http://wordpress.org',
+ 'code inside pre <pre>http://wordpress.org <code>http://wordpress.org</code> http://wordpress.org</pre>',
+ );
+
+ $expected = array(
+ '<pre>http://wordpress.org</pre>',
+ '<code>http://wordpress.org</code>',
+ '<pre class="foobar" id="foo">http://wordpress.org</pre>',
+ '<code class="foobar" id="foo">http://wordpress.org</code>',
+ '<precustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></precustomtag>',
+ '<codecustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></codecustomtag>',
+ 'URL before pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre>',
+ 'URL before code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code>',
+ 'URL after pre <pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+ 'URL after code <code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+ 'URL before and after pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+ 'URL before and after code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+ 'code inside pre <pre>http://wordpress.org <code>http://wordpress.org</code> http://wordpress.org</pre>',
+ );
+
+ foreach ( $before as $key => $url )
+ $this->assertEquals( $expected[ $key ], make_clickable( $url ) );
+ }
+
+ /**
</ins><span class="cx"> * @ticket 16892
</span><span class="cx"> */
</span><span class="cx"> function test_click_inside_html() {
</span></span></pre>
</div>
</div>
</body>
</html>