wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x

Browse Source 
Conflicts:

	lib/util.php
This commit is contained in:
Evan Prodromou 2009-02-06 14:28:17 -05:00
commit be6ce27538
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/util.php
View File

@ -394,7 +394,21 @@ function common_render_text($text)
function common_replace_urls_callback($text, $callback) { function common_replace_urls_callback($text, $callback) {
// Start off with a regex // Start off with a regex
preg_match_all('#(?:(?:(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://|(?:mailto|aim|tel):)[^.\s]+\.[^\s]+|(?:[^.\s/]+\.)+(?:museum|travel|[a-z]{2,4})(?:[:/][^\s]*)?)#i', $text, $matches); $regex = '#
(?:
(?:
(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://
|
(?:mailto|aim|tel):
)
[^.\s]+\.[^\s]+
|
(?:[^.\s/:]+\.)+
(?:museum|travel|[a-z]{2,4})
(?:[:/][^\s]*)?
)
#ix';
preg_match_all($regex, $text, $matches);
// Then clean up what the regex left behind // Then clean up what the regex left behind
$offset = 0; $offset = 0;