diff options
author | zotlabs <mike@macgirvin.com> | 2018-01-08 14:50:58 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-01-08 14:50:58 -0800 |
commit | 75804d7ce57a476c85a486c807ea1f5a75235a0e (patch) | |
tree | 13794288d5ffca739248d9ec017ef1a4cef9b93d /include/zot.php | |
parent | d4af870bb6500747790e6f196afeb4d75011185d (diff) | |
parent | 0600817ef75d19d1ec91ba822f8a6938d442824e (diff) | |
download | volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.tar.gz volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.tar.bz2 volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index 6c0d92a42..8e3d03ad8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3745,6 +3745,15 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { * @TODO * We also need to import local photos if a custom photo is selected */ + + if((strpos($profile['thumb'],'/photo/profile/l/') !== false) || intval($profile['is_default'])) { + $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; + $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; + } + else { + $profile['photo'] = z_root() . '/photo/' . basename($profile['photo']); + $profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']); + } } if(count($clean)) { |