aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-31 20:02:59 -0800
committerfriendica <info@friendica.com>2014-01-31 20:02:59 -0800
commitbd691300a77fbe511641eb5f707980cc1209dac7 (patch)
treef24f3c6966055e488f1272e1667b14a399970ea8 /include/items.php
parent902c9b158528b03e6e31f8b7f16fa4a5b16f62cd (diff)
downloadvolse-hubzilla-bd691300a77fbe511641eb5f707980cc1209dac7.tar.gz
volse-hubzilla-bd691300a77fbe511641eb5f707980cc1209dac7.tar.bz2
volse-hubzilla-bd691300a77fbe511641eb5f707980cc1209dac7.zip
provide some interesting new options to channel sources
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php4
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)