<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12088] trunk/wp-includes/formatting.php: Ensure that trailing )
in urls are included in the link when it looks appropriate.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12088">12088</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-10-22 18:46:27 +0000 (Thu, 22 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that trailing ) in urls are included in the link when it looks appropriate. Fixes <a href="http://trac.wordpress.org/ticket/10990">#10990</a> props filosofo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (12087 => 12088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2009-10-22 16:19:50 UTC (rev 12087)
+++ trunk/wp-includes/formatting.php 2009-10-22 18:46:27 UTC (rev 12088)
</span><span class="lines">@@ -1232,17 +1232,11 @@
</span><span class="cx"> function _make_url_clickable_cb($matches) {
</span><span class="cx"> $url = $matches[2];
</span><span class="cx">
</span><del>- $after = '';
- if ( preg_match( '|(.+?)([).,;:]*)$|', $url, $split ) ) {
- $url = $split[1];
- $after = $split[2];
- }
-
</del><span class="cx"> $url = esc_url($url);
</span><span class="cx"> if ( empty($url) )
</span><span class="cx"> return $matches[0];
</span><span class="cx">
</span><del>- return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>$after";
</del><ins>+ return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1304,7 +1298,7 @@
</span><span class="cx"> function make_clickable($ret) {
</span><span class="cx"> $ret = ' ' . $ret;
</span><span class="cx"> // in testing, using arrays here was found to be faster
</span><del>- $ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/\-=?@\[\](+]|[.,;:](?![\s<])|(?(1)\)(?![\s<])|\)))+)#is', '_make_url_clickable_cb', $ret);
</del><ins>+ $ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/=?@\[\](+-]|[.,;:](?![\s<]|(\))?([\s]|$))|(?(1)\)(?![\s<]|$)|\)))+)#is', '_make_url_clickable_cb', $ret);
</ins><span class="cx"> $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
</span><span class="cx"> $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
</span><span class="cx"> // this one is not in an array because we need it to run last, for cleanup of accidental links within links
</span></span></pre>
</div>
</div>
</body>
</html>