diff options
author | redmatrix <git@macgirvin.com> | 2016-07-03 15:58:20 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-07-03 15:58:20 -0700 |
commit | 57226b2e1378c2769709a2b2407249cc4e3b14f4 (patch) | |
tree | fbb6a4713b6ae9c5cb13ab47ffdb1d03a586c820 /Zotlabs/Module/Profile_photo.php | |
parent | 17e161006a9ddbfbea3e0b6d5f7776ad7b8101e2 (diff) | |
parent | f46eecc1e7585e64069bb18918a2db057a16c480 (diff) | |
download | volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.tar.gz volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.tar.bz2 volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.zip |
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Profile_photo.php')
-rw-r--r-- | Zotlabs/Module/Profile_photo.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 62c5e99ae..f459f7deb 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -53,7 +53,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); - if((array_key_exists('postfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) { + if((array_key_exists('cropfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) { // phase 2 - we have finished cropping @@ -90,12 +90,11 @@ class Profile_photo extends \Zotlabs\Web\Controller { $srcY = $_POST['ystart']; $srcW = $_POST['xfinal'] - $srcX; $srcH = $_POST['yfinal'] - $srcY; - + $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1", dbesc($image_id), dbesc(local_channel()), intval($scale)); - if($r) { $base_image = $r[0]; @@ -181,6 +180,8 @@ class Profile_photo extends \Zotlabs\Web\Controller { dbesc(datetime_convert()), dbesc($channel['xchan_hash']) ); + // Similarly, tell the nav bar to bypass the cache and update the avater image. + $_SESSION['reload_avatar'] = true; info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); |