From 1a6aad9929bc7d942a3f574f01360d41aaac551e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 1 Apr 2019 14:39:36 -0700 Subject: [PATCH] rdbms: make $wgSQLMode work as documented when it is NULL NULL means that the SET query should not be sent. This was broken since 5bc9b990acd0e0302f. Change-Id: I148b1153ef6ecca99c56e4f63247820a766ae779 --- includes/libs/rdbms/database/DatabaseMysqlBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php index 7fccd57f45..36c947f6eb 100644 --- a/includes/libs/rdbms/database/DatabaseMysqlBase.php +++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php @@ -106,7 +106,7 @@ abstract class DatabaseMysqlBase extends Database { $this->$var = $params[$var]; } } - $this->sqlMode = $params['sqlMode'] ?? ''; + $this->sqlMode = $params['sqlMode'] ?? null; $this->utf8Mode = !empty( $params['utf8Mode'] ); $this->insertSelectIsSafe = isset( $params['insertSelectIsSafe'] ) ? (bool)$params['insertSelectIsSafe'] : null; -- 2.20.1