From bf6aa15512cc6d31be320204fbc3c115bfd11b1b Mon Sep 17 00:00:00 2001
From: Johann Pardanaud <pardanaud.j@gmail.com>
Date: Wed, 17 Feb 2016 18:35:16 +0100
Subject: Improve avatar cropping internals, based on suggestions made by
 @rspeicher on !2773

---
 app/uploaders/avatar_uploader.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'app/uploaders/avatar_uploader.rb')

diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb
index 60ee80cf002..c8d9ab072e8 100644
--- a/app/uploaders/avatar_uploader.rb
+++ b/app/uploaders/avatar_uploader.rb
@@ -10,15 +10,8 @@ class AvatarUploader < CarrierWave::Uploader::Base
 
   process :cropper
 
-  def is_integer? string
-    true if Integer(string) rescue false
-  end
-
   def cropper
-    is_compliant = model.kind_of?(User) && is_integer?(model.avatar_crop_size)
-    is_compliant = is_compliant && is_integer?(model.avatar_crop_x) && is_integer?(model.avatar_crop_y)
-
-    if is_compliant
+    if model.kind_of?(User) && model.valid?
       manipulate! do |img|
         img.crop "#{model.avatar_crop_size}x#{model.avatar_crop_size}+#{model.avatar_crop_x}+#{model.avatar_crop_y}"
       end
-- 
cgit v1.2.3