diff options
| author | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
| commit | 18679111f5aed8f1c5e7ccb9857195e52c57765d (patch) | |
| tree | bffb4a563ed2fe1ff02a4221e28c608460c866db /include/items.php | |
| parent | fe3dfbee5638dd2988bd8b126652b3138572f02c (diff) | |
| parent | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (diff) | |
| download | volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.gz volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.bz2 volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index c461b83b4..7d52571c2 100755 --- a/include/items.php +++ b/include/items.php @@ -308,7 +308,7 @@ function get_atom_elements($feed,$item) { if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if(! $res['author-avatar']) { + if(!x($res, 'author-avatar') || !$res['author-avatar']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') $res['author-avatar'] = unxmlify($link['attribs']['']['href']); } @@ -323,7 +323,7 @@ function get_atom_elements($feed,$item) { foreach($base as $link) { if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link'])) $res['author-link'] = unxmlify($link['attribs']['']['href']); - if(! $res['author-avatar']) { + if(!x($res, 'author-avatar') || !$res['author-avatar']) { if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') $res['author-avatar'] = unxmlify($link['attribs']['']['href']); } @@ -503,7 +503,7 @@ function get_atom_elements($feed,$item) { $base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if(! $res['owner-avatar']) { + if(!x($res, 'owner-avatar') || !$res['owner-avatar']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') $res['owner-avatar'] = unxmlify($link['attribs']['']['href']); } |