Changeset 12088

Timestamp:

10/22/2009 06:46:27 PM (16 years ago)

Author:

westi

Message:

Ensure that trailing ) in urls are included in the link when it looks appropriate. Fixes #10990 props filosofo.

File:

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

trunk/wp-includes/formatting.php

@@ -1233 +1233 @@
     $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>$after";
+    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
 }
 
@@ -1305 +1299 @@
     $ret = ' ' . $ret;
     // in testing, using arrays here was found to be faster
-    $ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/\-=?@\[\](+]|[.,;:](?![\s<])|(?(1)\)(?![\s<])|\)))+)#is', '_make_url_clickable_cb', $ret);
+    $ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/=?@\[\](+-]|[.,;:](?![\s<]|(\))?([\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);