linkify URLs

darcs-hash:20080529190702-84dde-ef753ca1864b13e4c2ae0ebbd683c4f593f2f1f0.gz

diff --git a/lib/util.php b/lib/util.php
index 96960430247d7b68defbba46cb2bf36d289ecbc3..8b977400a777d5fb28f4e0fec035011633052145 100644 (file)
--- 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;