<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11844] trunk/wp-includes/formatting.php: Removed trailing .)
from the URL in make_clickable()</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11844">11844</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-08-19 23:56:10 +0000 (Wed, 19 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removed trailing .) from the URL in make_clickable()</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 (11843 => 11844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2009-08-19 22:37:51 UTC (rev 11843)
+++ trunk/wp-includes/formatting.php 2009-08-19 23:56:10 UTC (rev 11844)
</span><span class="lines">@@ -1185,10 +1185,18 @@
</span><span class="cx"> */
</span><span class="cx"> function _make_url_clickable_cb($matches) {
</span><span class="cx"> $url = $matches[2];
</span><ins>+
+ $after = '';
+ if ( preg_match( '|(.+)([).])$|', $url, $split ) ) {
+ $url = $split[1];
+ $after = $split[2];
+ }
+
</ins><span class="cx"> $url = esc_url($url);
</span><span class="cx"> if ( empty($url) )
</span><span class="cx"> return $matches[0];
</span><del>- return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
</del><ins>+
+ return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>$after";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1210,12 +1218,13 @@
</span><span class="cx"> $dest = esc_url($dest);
</span><span class="cx"> if ( empty($dest) )
</span><span class="cx"> return $matches[0];
</span><del>- // removed trailing [,;:] from URL
- if ( in_array(substr($dest, -1), array('.', ',', ';', ':')) === true ) {
</del><ins>+
+ // removed trailing [.,;:)] from URL
+ if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
</ins><span class="cx"> $ret = substr($dest, -1);
</span><span class="cx"> $dest = substr($dest, 0, strlen($dest)-1);
</span><span class="cx"> }
</span><del>- return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>" . $ret;
</del><ins>+ return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>