Minor changes on avatar cropping internals

- Avoid multiple calls to `validates` for the avatar attributes.
- In a cropping process, don't check if the model inherits `User`, check if it responds to `:avatar_crop_size`.

1 files changed, 4 insertions, 3 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 37285c2a9d4..cd6e4332a76 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -166,9 +166,10 @@ class User < ActiveRecord::Base
   validate :owns_public_email, if: ->(user) { user.public_email_changed? }
   validates :avatar, file_size: { maximum: 200.kilobytes.to_i }
 
-  [:avatar_crop_x, :avatar_crop_y, :avatar_crop_size].each do |field|
-    validates field, numericality: { only_integer: true }, presence: true, if: ->(user) { user.avatar_changed? }
-  end
+  validates :avatar_crop_x, :avatar_crop_y, :avatar_crop_size,
+    numericality: { only_integer: true },
+    presence: true,
+    if: ->(user) { user.avatar_changed? }
 
   before_validation :generate_password, on: :create
   before_validation :restricted_signup_domains, on: :create