Merge https://github.com/redmatrix/redmatrix into pending_merge

2015-09-11 14:57:26 -07:00
parent c8503daf5a fc58b8cc0d
commit d96ca61f2b
1 changed files with 4 additions and 1 deletions
--- 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'];