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

provide some interesting new options to channel sources

Browse Source
This commit is contained in:
friendica
2014-01-31 20:02:59 -08:00
parent 902c9b1585
commit bd691300a7
4 changed files with 1012 additions and 956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@@ -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)