harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

garbage in garbage out

Browse Source
This commit is contained in:
friendica 2015-02-03 16:03:05 -08:00
parent 44af22b968
commit 3f50313862
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/text.php
View File

@ -1946,9 +1946,9 @@ function find_xchan_in_array($xchan,$arr) {
} }
function get_rel_link($j,$rel) { function get_rel_link($j,$rel) {
if(count($j)) if(is_array($j) && ($j))
foreach($j as $l) 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 $l['href'];
return ''; return '';

5
include/zot.php
View File

@ -1084,6 +1084,11 @@ function zot_import($arr, $sender_url) {
if(is_array($incoming)) { if(is_array($incoming)) {
foreach($incoming as $i) { foreach($incoming as $i) {
if(! is_array($i)) {
logger('incoming is not an array');
continue;
}
$result = null; $result = null;
if(array_key_exists('iv',$i['notify'])) { if(array_key_exists('iv',$i['notify'])) {