harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red

Browse Source
This commit is contained in:
Thomas Willingham 2014-10-16 01:58:17 +01:00
commit 4af0b717de
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/text.php
View File

@ -619,8 +619,8 @@ function get_tags($s) {
} }
if(substr($mtch,-1,1) === '.') if(substr($mtch,-1,1) === '.')
$mtch = substr($mtch,0,-1); $mtch = substr($mtch,0,-1);
// ignore strictly numeric tags like #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) === '^')) if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^') || substr($mtch,1,1) === '#')
continue; continue;
// try not to catch url fragments // try not to catch url fragments
if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1))) if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1)))

2
version.inc
View File

@ -1 +1 @@
2014-10-14.828 2014-10-15.829