Changeset 10562

Timestamp:

02/12/2009 07:52:43 PM (16 years ago)

Author:

ryan

Message:

Handle links with parens in make_clickable(). Props filosofo. fixes #8300

File:

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

trunk/wp-includes/formatting.php

@@ -1122 +1122 @@
  */
 function _make_url_clickable_cb($matches) {
-    $ret = '';
     $url = $matches[2];
     $url = clean_url($url);
     if ( empty($url) )
         return $matches[0];
-    // removed trailing [.,;:] from URL
-    if ( in_array(substr($url, -1), array('.', ',', ';', ':')) === true ) {
-        $ret = substr($url, -1);
-        $url = substr($url, 0, strlen($url)-1);
-    }
-    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $ret;
+    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
 }
 
@@ -1193 +1187 @@
     $ret = ' ' . $ret;
     // in testing, using arrays here was found to be faster
-    $ret = preg_replace_callback('#([\s>])([\w]+?://[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]*)#is', '_make_url_clickable_cb', $ret);
+    $ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/\-=?@\[\](+]|[.,;:](?![\s<])|(?(1)\)(?![\s<])|\)))*)#is', '_make_url_clickable_cb', $ret);
     $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]*)#is', '_make_web_ftp_clickable_cb', $ret);
     $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);