diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
| commit | 8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c (patch) | |
| tree | 04add36aa35ce8cda58c5594a783737b25346175 /include/channel.php | |
| parent | 4d3b0577c9538644ca0eeb2751b285521d2cc86d (diff) | |
| parent | 866dc9a9b3ca1cd98fc032afe0aec14ccdb86ba0 (diff) | |
| download | volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.gz volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.bz2 volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.zip | |
Merge branch 'master' into tagging
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/channel.php b/include/channel.php index 7072bb4ce..fef933ba7 100644 --- a/include/channel.php +++ b/include/channel.php @@ -278,11 +278,13 @@ function create_identity($arr) { intval($arr['account_id']) ); + $photo_type = null; + $z = [ 'account' => $a[0], 'channel' => $r[0], 'photo_url' => '' ]; call_hooks('create_channel_photo',$z); if($z['photo_url']) { - import_channel_photo_from_url($z['photo_url'],$arr['account_id'],$r[0]['channel_id']); + $photo_type = import_channel_photo_from_url($z['photo_url'],$arr['account_id'],$r[0]['channel_id']); } if($role_permissions && array_key_exists('limits',$role_permissions)) @@ -330,6 +332,7 @@ function create_identity($arr) { 'xchan_guid' => $guid, 'xchan_guid_sig' => $sig, 'xchan_pubkey' => $key['pubkey'], + 'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'), 'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}", 'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}", 'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}", |