aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-10-16 21:37:14 +0200
committerStefan Parviainen <saparvia@caterva.eu>2014-10-16 21:37:14 +0200
commite425def2a2d81dc39e113a343eeab51764ce1163 (patch)
tree6535fba49d62e8ba504d73d4623616118ee3ec73 /include/text.php
parent6867a8a7f6060c82cba3a34cd944a3737e8e263e (diff)
parent865f804cfb86f12573ece550e1a7cf28172f6749 (diff)
downloadvolse-hubzilla-e425def2a2d81dc39e113a343eeab51764ce1163.tar.gz
volse-hubzilla-e425def2a2d81dc39e113a343eeab51764ce1163.tar.bz2
volse-hubzilla-e425def2a2d81dc39e113a343eeab51764ce1163.zip
Merge branch 'master' of https://github.com/pafcu/red
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index 0e38de2d2..fca23ca22 100644
--- a/include/text.php
+++ b/include/text.php
@@ -619,8 +619,8 @@ function get_tags($s) {
}
if(substr($mtch,-1,1) === '.')
$mtch = substr($mtch,0,-1);
- // ignore strictly numeric tags like #1
- if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^'))
+ // ignore strictly numeric tags like #1 or #^ bookmarks or ## double hash
+ if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^') || substr($mtch,1,1) === '#')
continue;
// try not to catch url fragments
if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1)))