diff options
| author | Eric Helgeson <erichelgeson@gmail.com> | 2009-07-22 10:28:17 -0500 |
|---|---|---|
| committer | Eric Helgeson <erichelgeson@gmail.com> | 2009-07-22 10:28:17 -0500 |
| commit | 829396106495a7b8090c31c383c0119912396cac (patch) | |
| tree | 409fce658a5704024cb3d64121392485b2033799 /lib/util.php | |
| parent | db19d61e68fcf8398579c2c4968e73db7f7ed93b (diff) | |
| parent | abae9379478f2b87915930be81cd7be97f12ed8f (diff) | |
Merge commit 'origin/0.8.x' into 0.9.x
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php index 9e8ec41d2..c7c82dba2 100644 --- a/lib/util.php +++ b/lib/util.php @@ -404,7 +404,7 @@ function common_render_text($text) $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r); $r = common_replace_urls_callback($r, 'common_linkify'); - $r = preg_replace('/(^|\(|\[|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r); + $r = preg_replace('/(^|\(|\[|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r); // XXX: machine tags return $r; } @@ -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]+'. '|'. |