diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-10-16 01:58:17 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-10-16 01:58:17 +0100 |
| commit | 4af0b717de2b0de8e80c68288ee9f753e163899f (patch) | |
| tree | a5b0aff6c0abc544c8bcc8c3f3f7a6eff191044b | |
| parent | 11ad127c68216734c406c393a361f2231e3a5a15 (diff) | |
| parent | e80c20d2584e17b43dd456bbb4b3dc0f8c11eeb4 (diff) | |
| download | volse-hubzilla-4af0b717de2b0de8e80c68288ee9f753e163899f.tar.gz volse-hubzilla-4af0b717de2b0de8e80c68288ee9f753e163899f.tar.bz2 volse-hubzilla-4af0b717de2b0de8e80c68288ee9f753e163899f.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
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 |