aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-15 17:55:20 -0700
committerfriendica <info@friendica.com>2014-10-15 17:55:20 -0700
commite80c20d2584e17b43dd456bbb4b3dc0f8c11eeb4 (patch)
treef5af3b6a1fd9fba62f23a64f6c33d5c20140c761
parent1eb478ba54206cca53653e7a579aa1a36fb03315 (diff)
downloadvolse-hubzilla-e80c20d2584e17b43dd456bbb4b3dc0f8c11eeb4.tar.gz
volse-hubzilla-e80c20d2584e17b43dd456bbb4b3dc0f8c11eeb4.tar.bz2
volse-hubzilla-e80c20d2584e17b43dd456bbb4b3dc0f8c11eeb4.zip
Don't recognise hashtags starting with #, e.g. ###
-rw-r--r--include/text.php4
-rw-r--r--version.inc2
2 files changed, 3 insertions, 3 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)))
diff --git a/version.inc b/version.inc
index 1984d7bf1..ccf12f9fc 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-10-14.828
+2014-10-15.829