diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-29 03:39:07 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-29 03:39:07 -0700 |
| commit | bc02b933727da7a000d43d2d7d495f066616dc81 (patch) | |
| tree | e590b70757edb94655872f5b992f143cead61eb3 /include/text.php | |
| parent | fc12123329133cea39f27615a7c24c57e5b4a35d (diff) | |
| parent | 7d9f785758ee6e4c19838e532f9930e227e95fc6 (diff) | |
| download | volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.gz volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.bz2 volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.zip | |
Merge remote branch 'upstream/master'
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))) |