From 74516df1067461b2a93b80eccdf9a14485d6a38c Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 18 Aug 2016 13:23:33 -0700
Subject: [PATCH] Send new account and password reset emails post-commit

Change-Id: I8f1bd3e882e20fefa5ce0167202d511aa066cfe2
---
 ...TemporaryPasswordPrimaryAuthenticationProvider.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php b/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
index 46cbab5a3a..ed94c1ad2b 100644
--- a/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
@@ -303,7 +303,11 @@ class TemporaryPasswordPrimaryAuthenticationProvider
 		);
 
 		if ( $sendMail ) {
-			$this->sendPasswordResetEmail( $req );
+			// Send email after DB commit
+			$dbw->onTransactionIdle( function () use ( $req ) {
+				/** @var TemporaryPasswordAuthenticationRequest $req */
+				$this->sendPasswordResetEmail( $req );
+			} );
 		}
 	}
 
@@ -370,7 +374,10 @@ class TemporaryPasswordPrimaryAuthenticationProvider
 		$this->providerChangeAuthenticationData( $req );
 
 		if ( $mailpassword ) {
-			$this->sendNewAccountEmail( $user, $creator, $req->password );
+			// Send email after DB commit
+			wfGetDB( DB_MASTER )->onTransactionIdle( function () use ( $user, $creator, $req ) {
+				$this->sendNewAccountEmail( $user, $creator, $req->password );
+			} );
 		}
 
 		return $mailpassword ? 'byemail' : null;
-- 
2.20.1