From 9d585dcc6d8010eb2c874c31e8b7e5d30cdc045a Mon Sep 17 00:00:00 2001 From: Samuel Hilson Date: Tue, 28 May 2019 14:29:59 -0500 Subject: [PATCH] installer: Add a defined check to overrideConfig method overrideConfig is a public static method and can be called multiple times by other processes but does not check that the constant `MW_NO_SESSION_HANDLER` is defined before attempting to set it. Bug: T224287 Change-Id: I01bcbd36ec001a5c55c2acebb24c44df3d3d3277 --- includes/installer/Installer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 26f9bf0d3d..ffa01c73ee 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -1764,7 +1764,9 @@ abstract class Installer { public static function overrideConfig() { // Use PHP's built-in session handling, since MediaWiki's // SessionHandler can't work before we have an object cache set up. - define( 'MW_NO_SESSION_HANDLER', 1 ); + if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) { + define( 'MW_NO_SESSION_HANDLER', 1 ); + } // Don't access the database $GLOBALS['wgUseDatabaseMessages'] = false; -- 2.20.1