]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'br3nda/0.8.x-hashtags' into 0.8.x
authorCraig Andrews <candrews@integralblue.com>
Wed, 22 Jul 2009 14:23:17 +0000 (10:23 -0400)
committerCraig Andrews <candrews@integralblue.com>
Wed, 22 Jul 2009 14:23:17 +0000 (10:23 -0400)
1  2 
lib/util.php

diff --combined lib/util.php
index f23f10e2c0879a479b9d895826c31b388e2fd179,edc396cc0217f650207a7e0e6bf3686efc076c1f..c7c82dba29fd7197e68397c8124e1420c54218dc
@@@ -404,7 -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 +414,9 @@@ function common_replace_urls_callback($
      $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]+'.
          '|'.