diff options
| author | pafcu <pafcu@iki.fi> | 2014-10-16 16:06:20 +0300 |
|---|---|---|
| committer | pafcu <pafcu@iki.fi> | 2014-10-16 16:06:20 +0300 |
| commit | 865f804cfb86f12573ece550e1a7cf28172f6749 (patch) | |
| tree | 5484d212498eea4ab0e98e531dc06d5623cb8364 /include/text.php | |
| parent | aa0aa22b8ad5db1589331e985e82781949985269 (diff) | |
| parent | e1f88fd15d75f81af5017860b9f197771326c9b7 (diff) | |
| download | volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.tar.gz volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.tar.bz2 volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.zip | |
Merge pull request #1 from friendica/master
Sync with upstream
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 4 |
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))) |