A script to GC sessions correctly

[quix0rs-gnu-social.git] / actions / avatarsettings.php

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index f38a44a24a3e782dc20b588005a6d39ac09c47b4..c2bb35a39580153a4b696015d104b42b4fb6b104 100644 (file)
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -324,13 +324,14 @@ class AvatarsettingsAction extends AccountSettingsAction
             return;
         }
 
-        // If image is not being cropped assume pos & dimentions of original
+        $file_d = ($filedata['width'] > $filedata['height'])
+                     ? $filedata['height'] : $filedata['width'];
+
         $dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0;
         $dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
-        $dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$filedata['width'];
-        $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$filedata['height'];
-        $size = min($dest_w, $dest_h);
-        $size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size;
+        $dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$file_d;
+        $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$file_d;
+        $size = min($dest_w, $dest_h, MAX_ORIGINAL);
 
         $user = common_current_user();
         $profile = $user->getProfile();
@@ -343,6 +344,7 @@ class AvatarsettingsAction extends AccountSettingsAction
             unset($_SESSION['FILEDATA']);
             $this->mode = 'upload';
             $this->showForm(_('Avatar updated.'), true);
+            common_broadcast_profile($profile);
         } else {
             $this->showForm(_('Failed updating avatar.'));
         }