diff --git a/lib/designsettings.php b/lib/designsettings.php
index a48ec9d227..b86265971c 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -326,6 +326,7 @@ class DesignSettingsAction extends AccountSettingsAction
$this->script('js/farbtastic/farbtastic.js');
$this->script('js/farbtastic/farbtastic.go.js');
+ $this->script('js/userdesign.go.js');
}
/**
diff --git a/lib/util.php b/lib/util.php
index 29eb6cbbce..7c1e219138 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('/(^|\"\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
// XXX: machine tags
return $r;
}
diff --git a/tests/HashTagDetectionTests.php b/tests/HashTagDetectionTests.php
index 4f0b31b0df..283226bd46 100644
--- a/tests/HashTagDetectionTests.php
+++ b/tests/HashTagDetectionTests.php
@@ -27,8 +27,20 @@ class HashTagDetectionTests extends PHPUnit_Framework_TestCase
return array(
array('hello',
'hello'),
- array('#hello',
- '#hello'),
+ array('#hello people',
+ '#hello people'),
+ array('"#hello" people',
+ '"#hello" people'),
+ array('say "#hello" people',
+ 'say "#hello" people'),
+ array('say (#hello) people',
+ 'say (#hello) people'),
+ array('say [#hello] people',
+ 'say [#hello] people'),
+ array('say {#hello} people',
+ 'say {#hello} people'),
+ array('say \'#hello\' people',
+ 'say \'#hello\' people'),
);
}
}