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

deliverable_singleton - also check hubloc_hash in case we don't have an xchan_hash

Browse Source
This commit is contained in:
zotlabs 2017-08-10 21:43:36 -07:00
parent 1408e3da3b
commit 86c4743ed9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/network.php
View File

@ -1652,9 +1652,17 @@ function check_channelallowed($hash) {
} }
function deliverable_singleton($channel_id,$xchan) { function deliverable_singleton($channel_id,$xchan) {
if(array_key_exists('xchan_hash',$xchan))
$xchan_hash = $xchan['xchan_hash'];
elseif(array_key_exists('hubloc_hash',$xchan))
$xchan_hash = $xchan['hubloc_hash'];
else
return true;
$r = q("select abook_instance from abook where abook_channel = %d and abook_xchan = '%s' limit 1", $r = q("select abook_instance from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
intval($channel_id), intval($channel_id),
dbesc($xchan['xchan_hash']) dbesc($xchan_hash)
); );
if($r) { if($r) {
if(! $r[0]['abook_instance']) if(! $r[0]['abook_instance'])