From e6528663c69c3323966f102fd371c659a3b93fc0 Mon Sep 17 00:00:00 2001 From: Adam Cooke Date: Fri, 21 Apr 2017 09:58:06 +0100 Subject: [PATCH] when a new user is added with a verified timestamp, don't just clear it --- app/models/user.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 520cf71..93145b0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -43,8 +43,10 @@ class User < ApplicationRecord when_attribute :email_address, :changes_to => :anything do before_save do |was, now| - self.email_verification_token = rand(999999).to_s.rjust(6, '0') - self.email_verified_at = nil + unless self.new_record? && self.email_verified_at + self.email_verification_token = rand(999999).to_s.rjust(6, '0') + self.email_verified_at = nil + end end after_commit do |was, new|