summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-29 15:07:02 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-29 15:07:02 -0400
commit45efc7b61bf5b960900ed69e768093f1238a060c (patch)
tree73bbeab1e32cd38a9b97b1b8bebbac2b2c27f388
parent754303ce9e8105c9d827ca2c009049ee7dec479c (diff)
linkify URLs
darcs-hash:20080529190702-84dde-ef753ca1864b13e4c2ae0ebbd683c4f593f2f1f0.gz
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 969604302..8b977400a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -355,7 +355,7 @@ function common_render_content($text, $notice) {
$r = htmlspecialchars($text);
$id = $notice->profile_id;
$r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
-# $r = preg_replace('(^|\b)(https?|ftp)://[-A-Z0-9+&@#/%?=~_|!:,.;]*[-A-Z0-9+&@#/%=~_|]', '<a href="\0" class="extlink">\0</a>', $r);
+ $r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
# XXX: # tags
# XXX: machine tags
return $r;