Fix #1695 by calling resetTransactionProfiler late, refs #1603

SemanticMediaWiki · Jul 4, 2016 · feeac57 · feeac57
1 parent 83072ec
commit feeac57
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/MediaWiki/DatabaseConnectionProvider.php b/src/MediaWiki/DatabaseConnectionProvider.php
@@ -17,6 +17,11 @@ class DatabaseConnectionProvider implements DBConnectionProvider {
 	 */
 	private $connection = null;
 
+	/**
+	 * @var Database
+	 */
+	private $resetTransactionProfiler = false;
+
 	/**
 	 * @see DBConnectionProvider::getConnection
 	 *
@@ -34,12 +39,12 @@ public function getConnection() {
 	}
 
 	/**
-	 * @see #1499
+	 * @see #1499, #1603
 	 *
 	 * @since 2.4
 	 */
 	public function resetTransactionProfiler() {
-		$this->getConnection()->resetTransactionProfiler();
+		$this->resetTransactionProfiler = true;
 	}
 
 	/**
@@ -60,6 +65,11 @@ private function createConnection() {
 
 		$connection->setDBPrefix( $GLOBALS['wgDBprefix'] );
 
+		// #1695
+		if ( $this->resetTransactionProfiler ) {
+			$connection->resetTransactionProfiler();
+		}
+
 		return $connection;
 	}