diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-01 02:15:40 -0700 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2017-11-01 12:13:21 +0100 |
| commit | 12f33d2cd43502fb8ce7b3399a4c60e40c10f723 (patch) | |
| tree | ea2ba25a44d332663b844011825e581587291e88 | |
| parent | 8467ecb1d7e71efb3d4fb016107b22a068642985 (diff) | |
| download | volse-hubzilla-12f33d2cd43502fb8ce7b3399a4c60e40c10f723.tar.gz volse-hubzilla-12f33d2cd43502fb8ce7b3399a4c60e40c10f723.tar.bz2 volse-hubzilla-12f33d2cd43502fb8ce7b3399a4c60e40c10f723.zip | |
Maria's profile photo issue, please push to master.
| -rw-r--r-- | Zotlabs/Module/Profile_photo.php | 10 | ||||
| -rw-r--r-- | include/zot.php | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 27e6bc445..411518c61 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -150,6 +150,14 @@ class Profile_photo extends \Zotlabs\Web\Controller { // If setting for the default profile, unset the profile photo flag from any other photos I own if($is_default_profile) { + + $r = q("update profile set photo = '%s', thumb = '%s' where is_default = 1 and uid = %d", + dbesc(z_root() . '/photo/profile/l/' . local_channel()), + dbesc(z_root() . '/photo/profile/m/' . local_channel()), + intval(local_channel()) + ); + + $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND uid = %d", intval(PHOTO_NORMAL), @@ -159,8 +167,6 @@ class Profile_photo extends \Zotlabs\Web\Controller { ); - - send_profile_photo_activity($channel,$base_image,$profile); } diff --git a/include/zot.php b/include/zot.php index 37c3c1444..9bb25dd6f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3649,6 +3649,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { $disallowed = array('id','aid','uid','guid'); foreach($arr['profile'] as $profile) { + $x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1", dbesc($profile['profile_guid']), intval($channel['channel_id']) @@ -3671,6 +3672,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(in_array($k,$disallowed)) continue; + if($profile['is_default'] && in_array($k,['photo','thumb'])) + continue; + if($k === 'name') $clean['fullname'] = $v; elseif($k === 'with') |