aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-10-26 12:15:38 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-10-26 12:15:38 +0200
commitdc212de9606422be6e912a0bb7f3569192942938 (patch)
tree5a253e3b57d14751214513a029d84699f5ad5b21 /include/text.php
parentbed0043b30c219a08aa0b352923299ea153d515c (diff)
parent6d6136cdb5a2149037c3cf315b3fa81a72bd7d55 (diff)
downloadvolse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.tar.gz
volse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.tar.bz2
volse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.zip
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index a9763fd21..e0f38a3a0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -481,7 +481,7 @@ function get_tags($s) {
// Otherwise pull out single word tags. These can be @nickname, @first_last
// and #hash tags.
- if(preg_match_all('/([@#][^ \x0D\x0A,:?]+)([ \x0D\x0A,:?]|$)/',$s,$match)) {
+ if(preg_match_all('/([@#][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) {
foreach($match[1] as $mtch) {
if(strstr($mtch,"]")) {
// we might be inside a bbcode color tag - leave it alone