Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: mod/connedit.php
2015-07-14 17:10:13 -07:00
parent da5cec24e0 3687fef53c
commit e8f19c1e15
13 changed files with 318 additions and 520 deletions
--- a/include/zot.php
+++ b/include/zot.php
@@ -1088,7 +1088,9 @@ function zot_import($arr, $sender_url) {
 				logger('specific recipients');
 				$recip_arr = array();
 				foreach($i['notify']['recipients'] as $recip) {
-					$recip_arr[] =  make_xchan_hash($recip['guid'],$recip['guid_sig']);
+					if(is_array($recip)) {
+						$recip_arr[] =  make_xchan_hash($recip['guid'],$recip['guid_sig']);
+					}
 				}
 				stringify_array_elms($recip_arr);
 				$recips = implode(',',$recip_arr);