diff options
| author | friendica <info@friendica.com> | 2015-02-03 16:03:58 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-03 16:03:58 -0800 |
| commit | de79bb89fc0f6d0a55b1734e4deeb0dd5eed2fb9 (patch) | |
| tree | 7b4a395abcc02c5a7df0fee56e0f2c0c8f51f2e9 | |
| parent | 8a78d1d5dfcb048b83345c0d832c71303de04cd5 (diff) | |
| parent | 3f50313862f5c2ca9d7118b234b2f154c7fb736a (diff) | |
| download | volse-hubzilla-de79bb89fc0f6d0a55b1734e4deeb0dd5eed2fb9.tar.gz volse-hubzilla-de79bb89fc0f6d0a55b1734e4deeb0dd5eed2fb9.tar.bz2 volse-hubzilla-de79bb89fc0f6d0a55b1734e4deeb0dd5eed2fb9.zip | |
Merge branch 'master' into pocorate
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | 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 1e9577dc6..0e1c5165a 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'])) { |