diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-21 12:50:45 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-21 12:50:45 -0700 |
| commit | 0a602725b1c49d246e77b24c723a65cdb0119e8e (patch) | |
| tree | 83a9b97c7ccc77e645f44df8aa405e2471aea5ff /lib/util.php | |
| parent | de987a9e63f38a3752491032d7a21759f2cc7560 (diff) | |
| parent | 3649b9ffbc40c3695344597330ad9c35b26a4976 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php index 9e8ec41d2..f23f10e2c 100644 --- 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]+'. '|'. |