Merge https://github.com/redmatrix/redmatrix into pending_merge
This commit is contained in:
commit
d96ca61f2b
@ -1068,8 +1068,11 @@ function zot_import($arr, $sender_url) {
|
|||||||
$data = json_decode(crypto_unencapsulate($data,get_config('system','prvkey')),true);
|
$data = json_decode(crypto_unencapsulate($data,get_config('system','prvkey')),true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! $data['success'])
|
if(! $data['success']) {
|
||||||
|
if($data['message'])
|
||||||
|
logger('remote pickup failed: ' . $data['message']);
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$incoming = $data['pickup'];
|
$incoming = $data['pickup'];
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user