Changeset 16948

Timestamp:

12/15/2010 01:43:30 PM (14 years ago)

Author:

westi

Message:

Ultimate make_clickable. Fixes #14993 props filosofo

File:

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

trunk/wp-includes/formatting.php

@@ -1313 +1313 @@
 function _make_url_clickable_cb($matches) {
     $url = $matches[2];
+    $suffix = '';
+    
+    /** Include parentheses in the URL only if paired **/
+    while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
+        $suffix = strrchr( $url, ')' ) . $suffix; 
+        $url = substr( $url, 0, strrpos( $url, ')' ) ); 
+    }
 
     $url = esc_url($url);
@@ -1318 +1325 @@
         return $matches[0];
 
-    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
+    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
 
@@ -1380 +1387 @@
     $ret = ' ' . $ret;
     // in testing, using arrays here was found to be faster
-    $ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/=?@\[\](!+-]|[.,;:](?![\s<]|(\))?([\s]|$))|(?(1)\)(?![\s<.,;:]|$)|\)))+)#is', '_make_url_clickable_cb', $ret);
+    $ret = preg_replace_callback('#(?<!=[\'"])(?<=[*\')+.,;:!&$\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#%~/?@\[\]-]|[\'*(+.,;:!=&$](?![\b\)]|(\))?([\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);