diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-01 13:49:53 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-01 13:49:53 +0100 |
| commit | b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d (patch) | |
| tree | 7409f78a360d237bb61c1b590a4d3e6412914727 /include/items.php | |
| parent | af75b77253bf051b9e3f486809bbabcd3c415732 (diff) | |
| parent | 94d874c0b2b5e719af3aa676d015307bab514b6a (diff) | |
| download | volse-hubzilla-b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d.tar.gz volse-hubzilla-b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d.tar.bz2 volse-hubzilla-b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 2fe923303..a74c3d460 100755 --- a/include/items.php +++ b/include/items.php @@ -2466,7 +2466,7 @@ function check_item_source($uid,$item) { return false; - $r = q("select * from source where src_channel_id = %d and src_xchan = '%s' limit 1", + $r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' || src_xchan = '*' ) limit 1", intval($uid), dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) ); @@ -2502,7 +2502,7 @@ function check_item_source($uid,$item) { foreach($words as $word) { if(substr($word,0,1) === '#' && $tags) { foreach($tags as $t) - if($t['type'] == TERM_HASHTAG && substr($t,1) === $word) + if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*'))) return true; } if(stristr($text,$word) !== false) |