summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-12-16 09:09:11 -0500
committerChristopher Speller <crspeller@gmail.com>2015-12-16 09:09:11 -0500
commit3e418a100a3a491ebff7ba72ac003dd06752a30a (patch)
treece321f1a197d7bcf5f43c7acf8c49b01363461f5 /web
parenta13fbfe493974319378949dd54c0523da4ea86c2 (diff)
parentb660acf8f893972c56817cfa49e8318f40aa32a0 (diff)
downloadchat-3e418a100a3a491ebff7ba72ac003dd06752a30a.tar.gz
chat-3e418a100a3a491ebff7ba72ac003dd06752a30a.tar.bz2
chat-3e418a100a3a491ebff7ba72ac003dd06752a30a.zip
Merge pull request #1710 from mattermost/plt-1498
PLT-1498 Add hashtag testing and allow special german characters
Diffstat (limited to 'web')
-rw-r--r--web/react/utils/text_formatting.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index f0bd46f9d..e837ded53 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -256,7 +256,7 @@ function autolinkHashtags(text, tokens) {
return prefix + alias;
}
- return output.replace(/(^|\W)(#[a-zA-Z][a-zA-Z0-9.\-_]*)\b/g, replaceHashtagWithToken);
+ return output.replace(/(^|\W)(#[a-zA-ZäöüÄÖÜß][a-zA-Z0-9äöüÄÖÜß.\-_]*)\b/g, replaceHashtagWithToken);
}
const puncStart = /^[.,()&$!\[\]{}':;\\]+/;