Changeset 11844

Timestamp:

08/19/2009 11:56:10 PM (17 years ago)

Author:

azaozz

Message:

Removed trailing .) from the URL in make_clickable()

File:

• trunk/wp-includes/formatting.php (modified) (2 diffs)

trunk/wp-includes/formatting.php

@@ -1186 +1186 @@
 function _make_url_clickable_cb($matches) {
         $url = $matches[2];
+
+        $after = '';
+        if ( preg_match( '|(.+)([).])$|', $url, $split ) ) {
+                $url = $split[1];
+                $after = $split[2];
+        }
+
         $url = esc_url($url);
         if ( empty($url) )
                 return $matches[0];
-        return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
+
+        return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>$after";
 }
 
@@ -1211 +1219 @@
         if ( empty($dest) )
                 return $matches[0];
-        // removed trailing [,;:] from URL
-        if ( in_array(substr($dest, -1), array('.', ',', ';', ':')) === true ) {
+
+        // removed trailing [.,;:)] from URL
+        if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
                 $ret = substr($dest, -1);
                 $dest = substr($dest, 0, strlen($dest)-1);
         }
-        return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>" . $ret;
+        return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }