From 2dc62613a11dfff7c2793987c28ca72408757db1 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Sun, 7 Feb 2016 17:46:34 -0500 Subject: [PATCH] Don't try to auto-create users when MW_NO_SESSION is defined Bug: T126177 Change-Id: Ia62ec77cd2cc177d81923a96171498dbc8c0ed50 --- includes/Setup.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/includes/Setup.php b/includes/Setup.php index ba3d628cf2..b9a1c377bb 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -796,13 +796,15 @@ foreach ( $wgExtensionFunctions as $func ) { // If the session user has a 0 id but a valid name, that means we need to // autocreate it. -$sessionUser = MediaWiki\Session\SessionManager::getGlobalSession()->getUser(); -if ( $sessionUser->getId() === 0 && User::isValidUserName( $sessionUser->getName() ) ) { - $ps_autocreate = Profiler::instance()->scopedProfileIn( $fname . '-autocreate' ); - MediaWiki\Session\SessionManager::autoCreateUser( $sessionUser ); - Profiler::instance()->scopedProfileOut( $ps_autocreate ); +if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { + $sessionUser = MediaWiki\Session\SessionManager::getGlobalSession()->getUser(); + if ( $sessionUser->getId() === 0 && User::isValidUserName( $sessionUser->getName() ) ) { + $ps_autocreate = Profiler::instance()->scopedProfileIn( $fname . '-autocreate' ); + MediaWiki\Session\SessionManager::autoCreateUser( $sessionUser ); + Profiler::instance()->scopedProfileOut( $ps_autocreate ); + } + unset( $sessionUser ); } -unset( $sessionUser ); wfDebug( "Fully initialised\n" ); $wgFullyInitialised = true; -- 2.20.1