aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-02 22:14:31 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-02 22:14:31 +0100
commitf826c09abc48a522c1a27b44a3fda1e337d90a1a (patch)
treef53302b072bae510e4d07d72c89b4238614df458 /include/zot.php
parente418a6b3d498cb237bd8f6dd01f40fe57d4a868d (diff)
parent3bd7133ba32d758df935a566c45515a530b35538 (diff)
downloadvolse-hubzilla-f826c09abc48a522c1a27b44a3fda1e337d90a1a.tar.gz
volse-hubzilla-f826c09abc48a522c1a27b44a3fda1e337d90a1a.tar.bz2
volse-hubzilla-f826c09abc48a522c1a27b44a3fda1e337d90a1a.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php9
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)) {