diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
| commit | 362b1cfdab4115478034e004c85001bb6d7abd68 (patch) | |
| tree | aff7422269c160ab15277e7913646aed1ca32bb5 /app/models/change_email_validator.rb | |
| parent | 4593cc9e546878d69f795ce75808aae60656213c (diff) | |
| parent | 95e7cd60a2ff78aa8550dc1855ee7c01a0f4c6f2 (diff) | |
Merge branch 'develop' into feature/fix-404-in-themes
Diffstat (limited to 'app/models/change_email_validator.rb')
| -rw-r--r-- | app/models/change_email_validator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/change_email_validator.rb b/app/models/change_email_validator.rb index e3f8fa892..80db96c64 100644 --- a/app/models/change_email_validator.rb +++ b/app/models/change_email_validator.rb @@ -30,7 +30,7 @@ class ChangeEmailValidator < ActiveRecord::BaseWithoutTable validates_presence_of :old_email, :message => N_("Please enter your old email address") validates_presence_of :new_email, :message => N_("Please enter your new email address") validates_presence_of :password, :message => N_("Please enter your password"), :unless => :changing_email - + def changing_email() self.user_circumstance == 'change_email' end |