aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-11-16 10:29:45 +0100
committerMario <mario@mariovavti.com>2018-11-16 10:29:45 +0100
commit2778a7220ff341956a00705db5da0f71f18c982c (patch)
tree30cc21bee1ce50caecc9f1c52f86a3e726096aa3
parentbeac45b0753c3362b8270f94c8d6e946eda36f01 (diff)
parent26f593afaad84d264bcb02728edfc8cee63b3836 (diff)
downloadvolse-hubzilla-2778a7220ff341956a00705db5da0f71f18c982c.tar.gz
volse-hubzilla-2778a7220ff341956a00705db5da0f71f18c982c.tar.bz2
volse-hubzilla-2778a7220ff341956a00705db5da0f71f18c982c.zip
Merge branch 'master' into 'master'
delivery issue See merge request hubzilla/core!1397
-rw-r--r--include/zot.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php
index 49fc89e33..3ccf0a81f 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1187,13 +1187,13 @@ function zot_fetch($arr) {
$zret = zot6_check_sig();
- if($zret['success'] && $zret['hubloc'] && $zret['hubloc']['hubloc_guid'] === $data['sender']['guid'] && $data['msg']) {
+ if($zret['success'] && $zret['hubloc'] && $zret['hubloc']['hubloc_guid'] === $arr['sender']['guid'] && $arr['msg']) {
logger('zot6_delivery',LOGGER_DEBUG);
- logger('zot6_data: ' . print_r($data,true),LOGGER_DATA);
+ logger('zot6_data: ' . print_r($arr,true),LOGGER_DATA);
$ret['collected'] = true;
- $import = [ 'success' => true, 'body' => json_encode( [ 'success' => true, 'pickup' => [ [ 'notify' => $data, 'message' => json_decode($data['msg'],true) ] ] ] ) ];
+ $import = [ 'success' => true, 'body' => json_encode( [ 'success' => true, 'pickup' => [ [ 'notify' => $arr, 'message' => json_decode($arr['msg'],true) ] ] ] ) ];
$hubs = [ $zret['hubloc'] ] ;
}