From 1509f3893c1ebe17959207e911653235608b10c2 Mon Sep 17 00:00:00 2001
From: Earle Martin <earle@downlode.org>
Date: Mon, 14 Jul 2008 22:20:45 -0400
Subject: Don't capture trailing ")", "]" or ">" as part of URLs

darcs-hash:20080715022045-68ac8-8f8222e7a97009297bed6ff88b6c020192fe6dd2.gz
---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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
-- 
cgit v1.2.3-54-g00ecf