summaryrefslogtreecommitdiff
path: root/actions/avatarsettings.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-03-04 05:11:18 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-03-04 05:11:18 +0000
commitdcdf47cff2dc62996df042aa0e5d19948b265686 (patch)
treefc3597f0d48b1c1cddb1a03e4f5963e38831f219 /actions/avatarsettings.php
parent8408e82f928d1b159a6c9f2dd8fabd269590be61 (diff)
Avatar crop fix for shrinking/stretching of images when user doesn't
scale it with the Jcrop tool (but hits Crop). This will use the lower value from width/height.
Diffstat (limited to 'actions/avatarsettings.php')
-rw-r--r--actions/avatarsettings.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 6545d9489..c2bb35a39 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -324,11 +324,13 @@ class AvatarsettingsAction extends AccountSettingsAction
return;
}
- // If image is not being cropped assume pos & dimensions 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'];
+ $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();