aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-11 14:57:26 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-11 14:57:26 -0700
commitd96ca61f2bb6b14fb1d8b4a6705d9cb64474b896 (patch)
treeb7d4ffad7d65132016b4323285dd3d4e7441f8dc
parentc8503daf5a6db3cebf0c7d8828d0bf573962871e (diff)
parentfc58b8cc0d102dc838c9f8fda584a1b87b08c6da (diff)
downloadvolse-hubzilla-d96ca61f2bb6b14fb1d8b4a6705d9cb64474b896.tar.gz
volse-hubzilla-d96ca61f2bb6b14fb1d8b4a6705d9cb64474b896.tar.bz2
volse-hubzilla-d96ca61f2bb6b14fb1d8b4a6705d9cb64474b896.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--include/zot.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 290fd65bc..ff5d731df 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1068,8 +1068,11 @@ function zot_import($arr, $sender_url) {
$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;
+ }
$incoming = $data['pickup'];