diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-09-14 11:38:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-09-14 11:38:52 +0000 |
| commit | 5ccbe10d10208ee6ed68b792a782cdd5ebcd64ec (patch) | |
| tree | d7104e7f91d497b351a05a37a7f59a07ee2bf401 | |
| parent | d444dc61af3850efc532521acc1ef21b433d2bfc (diff) | |
| download | redmine-5ccbe10d10208ee6ed68b792a782cdd5ebcd64ec.tar.gz redmine-5ccbe10d10208ee6ed68b792a782cdd5ebcd64ec.zip | |
Code cleanup (#17717).
git-svn-id: http://svn.redmine.org/redmine/trunk@13403 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/user.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 36594137d..8405fa4b6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -687,10 +687,12 @@ class User < Principal # was compromised. def destroy_tokens tokens = [] - tokens |= ['recovery', 'autologin'] if changes.has_key?('hashed_password') - tokens |= ['recovery'] if changes.has_key?('mail') + tokens |= ['recovery', 'autologin'] if hashed_password_changed? + tokens |= ['recovery'] if mail_changed? - Token.delete_all(['user_id = ? AND action IN (?)', self.id, tokens]) if tokens.any? + if tokens.any? + Token.where(:user_id => id, :action => tokens).delete_all + end end # Removes references that are not handled by associations |