From: Reedy <reedy@wikimedia.org>
Date: Tue, 11 Oct 2016 21:29:04 +0000 (+0100)
Subject: Call parent::__construct() in MysqlBase AFTER transferring specific parameters
X-Git-Tag: 1.31.0-rc.0~5136^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=91e54fcad87b051c0d1aaf6c37cce764ac37c6fb;p=lhc%2Fweb%2Fwiklou.git

Call parent::__construct() in MysqlBase AFTER transferring specific parameters

Bug: T147852
Change-Id: Id07bb38efb6a9a3b4f4f7e07c0a2c6a74bb1b58d
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index f504ec4d91..e55680a758 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -72,8 +72,6 @@ abstract class DatabaseMysqlBase extends Database {
 	 * @param array $params
 	 */
 	function __construct( array $params ) {
-		parent::__construct( $params );
-
 		$this->lagDetectionMethod = isset( $params['lagDetectionMethod'] )
 			? $params['lagDetectionMethod']
 			: 'Seconds_Behind_Master';
@@ -89,6 +87,8 @@ abstract class DatabaseMysqlBase extends Database {
 		}
 		$this->sqlMode = isset( $params['sqlMode'] ) ? $params['sqlMode'] : '';
 		$this->utf8Mode = !empty( $params['utf8Mode'] );
+
+		parent::__construct( $params );
 	}
 
 	/**