Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap

This commit is contained in:
zotlabs 2018-09-04 19:06:49 -07:00
commit c42dd61301

View file

@ -1012,6 +1012,9 @@ class Activity {
else
$icon = $person_obj['icon'];
}
if(! $icon) {
$icon = z_root() . '/' . get_default_profile_photo();
}
if(is_array($person_obj['url']) && array_key_exists('href', $person_obj['url']))
$profile = $person_obj['url']['href'];