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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	include/zot.php
This commit is contained in:
redmatrix 2015-07-15 18:41:50 -07:00
commit b9fd8b4614
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/zot.php
View File

@ -1092,9 +1092,15 @@ function zot_import($arr, $sender_url) {
$recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']); $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
} }
} }
$r = false;
if($recip_arr) {
stringify_array_elms($recip_arr); stringify_array_elms($recip_arr);
$recips = implode(',',$recip_arr); $recips = implode(',',$recip_arr);
$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and channel_removed = 0 "); $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " )
and channel_removed = 0 ");
}
if(! $r) { if(! $r) {
logger('recips: no recipients on this site'); logger('recips: no recipients on this site');
continue; continue;

2
mod/channel.php
View File

@ -175,7 +175,7 @@ function channel_content(&$a, $update = 0, $load = false) {
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
WHERE uid = %d $item_normal WHERE uid = %d $item_normal
AND item_wall = 1 AND item_unseen = 1 AND item_wall = 1 AND item_unseen = 1
AND (abook.blocked = 0 or abook.abook_flags is null) AND (abook.abook_blocked = 0 or abook.abook_flags is null)
$sql_extra $sql_extra
ORDER BY created DESC", ORDER BY created DESC",
intval($a->profile['profile_uid']) intval($a->profile['profile_uid'])