summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-22 10:23:17 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-22 10:23:17 -0400
commite70a79d6ab5e9cd8894490d4fc0d3b855e807edc (patch)
tree642a3955ddf938f770d035148f5c2a5d1b534cc1 /lib
parentdb4ffca5350a11835c2c990f8d77d7cabb365a43 (diff)
parentd95f45f0705467cfc7e3650db932e43f0a20e45f (diff)
Merge commit 'br3nda/0.8.x-hashtags' into 0.8.x
Diffstat (limited to 'lib')
-rw-r--r--lib/router.php2
-rw-r--r--lib/util.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php
index 5e0fcfc94..8e4836497 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -211,7 +211,7 @@ class Router
array('tag' => '[a-zA-Z0-9]+'));
$m->connect('tag/:tag',
array('action' => 'tag'),
- array('tag' => '[a-zA-Z0-9]+'));
+ array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect('peopletag/:tag',
array('action' => 'peopletag'),
diff --git a/lib/util.php b/lib/util.php
index f23f10e2c..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;
}