diff options
author | Earle Martin <earle@downlode.org> | 2008-07-14 22:20:45 -0400 |
---|---|---|
committer | Earle Martin <earle@downlode.org> | 2008-07-14 22:20:45 -0400 |
commit | 1509f3893c1ebe17959207e911653235608b10c2 (patch) | |
tree | f9e20dc6fbc41080cc64235a8ddbc6a8dafa589c | |
parent | 40b73c829f628f3ce1086ccd7a6e3341631aee34 (diff) |
Don't capture trailing ")", "]" or ">" as part of URLs
darcs-hash:20080715022045-68ac8-8f8222e7a97009297bed6ff88b6c020192fe6dd2.gz
-rw-r--r-- | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 97a36296c..1e874e04b 100644 --- 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 |