From f8e8ce0a7f463875faf3e2aa926630515dc3bc81 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Fri, 30 Jan 2026 02:38:46 +0000 Subject: [PATCH] Merge r24387 from trunk to 6.0-stable (#43668). git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@24391 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/email_addresses_controller.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/email_addresses_controller.rb b/app/controllers/email_addresses_controller.rb index 4c7e6deca..ac36693f5 100644 --- a/app/controllers/email_addresses_controller.rb +++ b/app/controllers/email_addresses_controller.rb @@ -30,10 +30,13 @@ class EmailAddressesController < ApplicationController def create saved = false - if @user.email_addresses.count <= Setting.max_additional_emails.to_i - @address = EmailAddress.new(:user => @user, :is_default => false) - @address.safe_attributes = params[:email_address] - saved = @address.save + User.transaction do + @user.reload(lock: true) + if @user.email_addresses.count <= Setting.max_additional_emails.to_i + @address = EmailAddress.new(:user => @user, :is_default => false) + @address.safe_attributes = params[:email_address] + saved = @address.save + end end respond_to do |format|