Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy...

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

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 139d85b4c28e1cf6933998dd9d1c10d21754fdc0..0f8122c075c32d838186a59058568888d8d262b6 100644 (file)
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -320,7 +320,7 @@ class AvatarsettingsAction extends AccountSettingsAction
             $this->serverError(_('Lost our file data.'));
             return;
         }
-        
+
         // If image is not being cropped assume pos & dimentions of original
         $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;
@@ -328,10 +328,10 @@ class AvatarsettingsAction extends AccountSettingsAction
         $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;
-        
+
         $user = common_current_user();
         $profile = $user->getProfile();
-        
+
         $imagefile = new ImageFile($user->id, $filedata['filepath']);
         $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);