github/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-04-28 03:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mark confirmable roles as active when confirmation_required? is false

Browse Source 
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Paul Rosania
2010-05-05 16:31:11 -05:00
committed by José Valim
parent 59bee679ca
commit 02c2df65cd
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/devise/models/confirmable.rb
View File

@@ -63,7 +63,7 @@ module Devise
# is already confirmed, it should never be blocked. Otherwise we need to
# calculate if the confirm time has not expired for this user.
def active?
super && (confirmed? || confirmation_period_valid?)
super && (!confirmation_required? || confirmed? || confirmation_period_valid?)
end
# The message to be shown if the account is inactive.