aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-03 16:03:05 -0800
committerfriendica <info@friendica.com>2015-02-03 16:03:05 -0800
commit3f50313862f5c2ca9d7118b234b2f154c7fb736a (patch)
tree9c614f4e9d8ac3402bd2d9fa83564767eb85cc4b
parent44af22b968643a1aed26fc1831455d16fa26719e (diff)
downloadvolse-hubzilla-3f50313862f5c2ca9d7118b234b2f154c7fb736a.tar.gz
volse-hubzilla-3f50313862f5c2ca9d7118b234b2f154c7fb736a.tar.bz2
volse-hubzilla-3f50313862f5c2ca9d7118b234b2f154c7fb736a.zip
garbage in garbage out
-rw-r--r--include/text.php4
-rw-r--r--include/zot.php5
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'])) {