Merge leading and trailing whitespace validators

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 17985e05f45d1ad56d126b2886d5b20b81f5db48..a57c8837948a5f6f86a1c8a27972978a0d90ec9b 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -95,8 +95,7 @@ class User < ActiveRecord::Base
   validates :display_name, :if => proc { |u| u.display_name_changed? },
                            :invalid_chars => true,
                            :invalid_url_chars => true,
-                           :leading_whitespace => true,
-                           :trailing_whitespace => true
+                           :whitespace => { :leading => false, :trailing => false }
   validates :email, :presence => true, :confirmation => true, :invalid_chars => true
   validates :email, :if => proc { |u| u.email_changed? },
                     :uniqueness => { :case_sensitive => false }