Update CHANGELOG.

CHANGELOG.rdoc

@@ -1,7 +1,12 @@
+== 1.6.0 (unreleased)
+
+* enhancements
+  * Add support for e-mail reconfirmation on change (by github.com/Mandaryn and github.com/heimidal)
+
 == 1.5.2
 
 * enhancements
-  * Add support for rails 3.1 new mass assignment conventions (by github.com/kirs)
+  * Add support for Rails 3.1 new mass assignment conventions (by github.com/kirs)
   * Add timeout_in method to Timeoutable, it can be overriden in a model (by github.com/lest)
 
 * bug fix

lib/devise/models/confirmable.rb

@@ -33,7 +33,7 @@ module Devise
         before_create :generate_confirmation_token, :if => :confirmation_required?
         after_create  :send_confirmation_instructions, :if => :confirmation_required?
         before_update :postpone_email_change_until_confirmation, :if => :postpone_email_change?
-        after_update :send_confirmation_instructions, :if => :email_change_confirmation_required?
+        after_update :send_confirmation_instructions, :if => :reconfirmation_required?
       end
 
       # Confirm a user by setting it's confirmed_at to actual time. If the user
@@ -66,7 +66,7 @@ module Devise
 
       # Send confirmation instructions by email
       def send_confirmation_instructions
-        @email_change_confirmation_required = false
+        @reconfirmation_required = false
         generate_confirmation_token! if self.confirmation_token.nil?
         self.devise_mailer.confirmation_instructions(self).deliver
       end
@@ -136,7 +136,7 @@ module Devise
         # Checks whether the record is confirmed or not or a new email has been added, yielding to the block
         # if it's already confirmed, otherwise adds an error to email.
         def unless_confirmed
-          unless confirmed? && (self.class.reconfirmable ? unconfirmed_email.blank? : true)
+          unless confirmed? && !pending_reconfirmation?
             yield
           else
             self.errors.add(:email, :already_confirmed)
@@ -161,7 +161,7 @@ module Devise
         end
 
         def postpone_email_change_until_confirmation
-          @email_change_confirmation_required = true
+          @reconfirmation_required = true
           self.unconfirmed_email = self.email
           self.email = self.email_was
         end
@@ -172,8 +172,8 @@ module Devise
           postpone
         end
 
-        def email_change_confirmation_required?
-          self.class.reconfirmable && @email_change_confirmation_required
+        def reconfirmation_required?
+          self.class.reconfirmable && @reconfirmation_required
         end
 
       module ClassMethods

lib/devise/models/timeoutable.rb

@@ -23,7 +23,6 @@ module Devise
       # Checks whether the user session has expired based on configured time.
       def timedout?(last_access)
         return false if remember_exists_and_not_expired?
-
         !timeout_in.nil? && last_access && last_access <= timeout_in.ago
       end
 
@@ -35,7 +34,6 @@ module Devise
 
       def remember_exists_and_not_expired?
         return false unless respond_to?(:remember_expired?)
-
         remember_created_at && !remember_expired?
       end