diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-04 19:37:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-04 19:37:35 -0700 |
| commit | 2862baeee1cbecead3c9d38d2798140ac0256d1a (patch) | |
| tree | 525c291cd4611b0cbb481bb928d1c653cfa6a700 /Zotlabs/Module/Profile_photo.php | |
| parent | 47b29594867deb96f6b93d8a5ace8d4d4e569630 (diff) | |
| parent | 6f88d5e92be06ad8fa61f900e8a4fb41ba54135e (diff) | |
| download | volse-hubzilla-2862baeee1cbecead3c9d38d2798140ac0256d1a.tar.gz volse-hubzilla-2862baeee1cbecead3c9d38d2798140ac0256d1a.tar.bz2 volse-hubzilla-2862baeee1cbecead3c9d38d2798140ac0256d1a.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Profile_photo.php')
| -rw-r--r-- | Zotlabs/Module/Profile_photo.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 47b627015..27e6bc445 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -158,6 +158,9 @@ class Profile_photo extends \Zotlabs\Web\Controller { intval(local_channel()) ); + + + send_profile_photo_activity($channel,$base_image,$profile); } @@ -174,12 +177,17 @@ class Profile_photo extends \Zotlabs\Web\Controller { // We'll set the updated profile-photo timestamp even if it isn't the default profile, // so that browsers will do a cache update unconditionally + // Also set links back to site-specific profile photo url in case it was + // changed to a generic URL by a clone operation. Otherwise the new photo may + // not get pushed to other sites correctly. - - $r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s' + $r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'", dbesc($im->getType()), dbesc(datetime_convert()), + dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), dbesc($channel['xchan_hash']) ); |