Don't capture trailing ")", "]" or ">" as part of URLs

darcs-hash:20080715022045-68ac8-8f8222e7a97009297bed6ff88b6c020192fe6dd2.gz

diff --git a/lib/util.php b/lib/util.php
index 97a36296cffc548d111556b364767d54e3fe4f8e..1e874e04b2be26637da91a76e79af299384422f8 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -593,7 +593,7 @@ define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet
 function common_render_content($text, $notice) {
        $r = htmlspecialchars($text);
        $id = $notice->profile_id;
-       $r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
+       $r = preg_replace('@https?://[^)\]>\s]+@', '<a href="\0" class="extlink">\0</a>', $r);
        $r = preg_replace('/(^|\s+)@([a-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
        # XXX: # tags
        # XXX: machine tags