app/controllers/devise/invitations_controller.rb in devise_invitable-1.4.1 vs app/controllers/devise/invitations_controller.rb in devise_invitable-1.4.2

- old
+ new

@@ -41,13 +41,18 @@ invitation_accepted = resource.errors.empty? yield resource if block_given? if invitation_accepted - flash_message = resource.active_for_authentication? ? :updated : :updated_not_active - set_flash_message :notice, flash_message if is_flashing_format? - sign_in(resource_name, resource) - respond_with resource, :location => after_accept_path_for(resource) + if Devise.allow_insecure_sign_in_after_accept + flash_message = resource.active_for_authentication? ? :updated : :updated_not_active + set_flash_message :notice, flash_message if is_flashing_format? + sign_in(resource_name, resource) + respond_with resource, :location => after_accept_path_for(resource) + else + set_flash_message :notice, :updated_not_active if is_flashing_format? + respond_with resource, :location => new_session_path(resource_name) + end else respond_with_navigational(resource){ render :edit } end end