aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-15 18:41:50 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-15 18:41:50 -0700
commitb9fd8b46141cebbd5658819782f797cf14cef1fd (patch)
treed5067b2e590b2e510cff71bac0447d669cb54da1 /include
parent7f6e4d5f4a56355b01fd1ccdf433f4b215b3d669 (diff)
parent7db515b77cc17be545358ac1aba9b6b21c460507 (diff)
downloadvolse-hubzilla-b9fd8b46141cebbd5658819782f797cf14cef1fd.tar.gz
volse-hubzilla-b9fd8b46141cebbd5658819782f797cf14cef1fd.tar.bz2
volse-hubzilla-b9fd8b46141cebbd5658819782f797cf14cef1fd.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: include/zot.php
Diffstat (limited to 'include')
-rw-r--r--include/zot.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php
index c4860cc3b..1c6a09494 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1092,9 +1092,15 @@ function zot_import($arr, $sender_url) {
$recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
}
}
- stringify_array_elms($recip_arr);
- $recips = implode(',',$recip_arr);
- $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and channel_removed = 0 ");
+
+ $r = false;
+ if($recip_arr) {
+ stringify_array_elms($recip_arr);
+ $recips = implode(',',$recip_arr);
+ $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " )
+ and channel_removed = 0 ");
+ }
+
if(! $r) {
logger('recips: no recipients on this site');
continue;