From 3f50313862f5c2ca9d7118b234b2f154c7fb736a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 3 Feb 2015 16:03:05 -0800
Subject: garbage in garbage out

---
 include/text.php | 4 ++--
 include/zot.php  | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/text.php b/include/text.php
index d19519779..ef2fc2371 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1946,9 +1946,9 @@ function find_xchan_in_array($xchan,$arr) {
 }
 
 function get_rel_link($j,$rel) {
-	if(count($j))
+	if(is_array($j) && ($j))
 		foreach($j as $l)
-			if($l['rel'] === $rel)
+			if(array_key_exists('rel',$j) && $l['rel'] === $rel && array_key_exists('href',$l))
 				return $l['href'];
 
 	return '';
diff --git a/include/zot.php b/include/zot.php
index 04b6806c2..7002fee0a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -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'])) {
-- 
cgit v1.2.3