move linkifying so URL links come first

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 8819022778398a70f81095f76ec4c769e3d30dd0..30bd4d3aec96dd11ef8f8282b223c0a56cacf71d 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -354,8 +354,8 @@ 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('/(^|\s)@([\w-]+)($|\s)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
-#      $r = preg_replace('q'.URL_REGEX.'q', '<a href="\\0" class="extlink">\\0</a>', $r);
+       $r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
+       $r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
        # XXX: # tags
        # XXX: machine tags
        return $r;