summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorBrenda Wallace <shiny@cpan.org>2009-08-26 10:02:07 +1200
committerBrenda Wallace <shiny@cpan.org>2009-08-26 10:02:07 +1200
commit6c3149334cf69a33026a75be9f5ea579b2de3b8d (patch)
tree7150a6bd920f2f7c1b29b2cd50645885a7b6ed62 /lib/util.php
parent3400f6f431436552d3bef81a4b25733db2cdd9b6 (diff)
parenta2117961be463d566c8f3c6ccd9b8e840f171804 (diff)
Merge commit 'mainline-write/0.8.x' into 0.8.x
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 29eb6cbbc..7c1e21913 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+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
+ $r = preg_replace('/(^|\&quot\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
// XXX: machine tags
return $r;
}