Merge commit 'br3nda/0.8.x-hashtags' into 0.8.x

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

diff --git a/lib/util.php b/lib/util.php
index edc396cc0217f650207a7e0e6bf3686efc076c1f..c7c82dba29fd7197e68397c8124e1420c54218dc 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -414,9 +414,9 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
     $regex = '#'.
     '(?:'.
         '(?:'.
-            '(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://'.
+            '(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|irc)://'.
             '|'.
-            '(?:mailto|aim|tel):'.
+            '(?:mailto|aim|tel|xmpp):'.
         ')'.
         '[^.\s]+\.[^\s]+'.
         '|'.