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.

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 6545d94893c534f273f02fd0a8044e644fdd48d6..c2bb35a39580153a4b696015d104b42b4fb6b104 100644 (file)
--- 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();

diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
index b2737407bfbba8f3c02bec05211fa4a7f9364251..a0399d540510db1638a9f233dbeb5ef18bcc6bc1 100644 (file)
--- a/js/jcrop/jquery.Jcrop.go.js
+++ b/js/jcrop/jquery.Jcrop.go.js
@@ -37,10 +37,3 @@
                        $('#avatar_crop_w').val(c.w);
                        $('#avatar_crop_h').val(c.h);
                };
-
-               function checkCoords() {
-                       if (parseInt($('#avatar_crop_w').val())) return true;
-                       alert('Please select a crop region then press submit.');
-                       return false;
-               };
-