diff options
author | Sean Murphy <sgmurphy@gmail.com> | 2009-02-04 20:02:50 -0500 |
---|---|---|
committer | Sean Murphy <sgmurphy@gmail.com> | 2009-02-04 20:02:50 -0500 |
commit | 0f12d6135ea21f3cd55aea0d12b1680cbb81d7e9 (patch) | |
tree | 06de6a46061baf502be402bb3a8568bd5ab2391e /lib | |
parent | 7e975b17c5a857479826f6d730c1ca85c513f4d1 (diff) |
Fixed #732; Hashtags inside parens and brackets.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 07e124811..c26ca6b62 100644 --- a/lib/util.php +++ b/lib/util.php @@ -388,7 +388,7 @@ function common_render_text($text) $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r); $r = preg_replace_callback('@(ftp|http|https|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://[^\]>\s]+@', 'common_render_uri_thingy', $r); $r = preg_replace_callback('@(mailto|aim|tel):[^\]>\s]+@', 'common_render_uri_thingy', $r); // Pseudo-protocols don't require '//' after ':'. - $r = preg_replace('/(^|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r); + $r = preg_replace('/(^|\(|\[|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r); // XXX: machine tags return $r; } |