From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 17 Aug 2017 04:25:29 +0000 (-0700)
Subject: database: make close() sanity check mTrxPreCommitCallbacks
X-Git-Tag: 1.31.0-rc.0~2381^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=a619be816390e13dadd03082da170d26f2ee54d2;p=lhc%2Fweb%2Fwiklou.git

database: make close() sanity check mTrxPreCommitCallbacks

The other callback types are already checked too.

Change-Id: Ibdc82110c0a0e74bb07ed92ee667bdf0d9f69f90
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 7349b63a59..cec13b50ee 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -758,7 +758,11 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 			$closed = $this->closeConnection();
 			$this->mConn = false;
-		} elseif ( $this->mTrxIdleCallbacks || $this->mTrxEndCallbacks ) { // sanity
+		} elseif (
+			$this->mTrxIdleCallbacks ||
+			$this->mTrxPreCommitCallbacks ||
+			$this->mTrxEndCallbacks
+		) { // sanity
 			throw new RuntimeException( "Transaction callbacks still pending." );
 		} else {
 			$closed = true;