]> source.dussan.org Git - redmine.git/commitdiff
Rails3: replace deprecated Errors#on to Errors#[] at app/models/mail_handler.rb
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 5 Jan 2012 14:47:35 +0000 (14:47 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 5 Jan 2012 14:47:35 +0000 (14:47 +0000)
On Rails2, Errors#[] returns single error if one error raises.
But, on Rails3, Errors#[] always returns the array.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8520 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/mail_handler.rb

index 221b7885eec74a8b3e9587a8856fe17566835a2a..4ded2acb0c5e6eef4f420d459aae0f7239c92807 100644 (file)
@@ -346,9 +346,9 @@ class MailHandler < ActionMailer::Base
     user.language = Setting.default_language
 
     unless user.valid?
-      user.login = "user#{ActiveSupport::SecureRandom.hex(6)}" if user.errors.on(:login)
-      user.firstname = "-" if user.errors.on(:firstname)
-      user.lastname = "-" if user.errors.on(:lastname)
+      user.login = "user#{ActiveSupport::SecureRandom.hex(6)}" unless user.errors[:login].blank?
+      user.firstname = "-" unless user.errors[:firstname].blank?
+      user.lastname  = "-" unless user.errors[:lastname].blank?
     end
 
     user