Merge branch 'master' into pocorate

2015-02-03 16:03:58 -08:00
parent 8a78d1d5df 3f50313862
commit de79bb89fc
2 changed files with 7 additions and 2 deletions
@@ -1084,6 +1084,11 @@ function zot_import($arr, $sender_url) {

 	if(is_array($incoming)) {
 		foreach($incoming as $i) {
+			if(! is_array($i)) {
+				logger('incoming is not an array');
+				continue;
+			}
+
 			$result = null;

 			if(array_key_exists('iv',$i['notify'])) {