X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=064bd6df4feddbf813997337674a429ee8175895;hb=a759297ac827f87a31c28e2623541788ef55b7a5;hp=28183497a3c2304118bb074ac5aff29feed2fa31;hpb=e19a52f2f5376b08c303d31bdcfec56da560f2b0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 28183497a3..064bd6df4f 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -370,12 +370,14 @@ abstract class Installer {
 		$GLOBALS['wgMemc'] = new EmptyBagOStuff;
 		ObjectCache::clear();
 		$emptyCache = array( 'class' => 'EmptyBagOStuff' );
+		// disable (problematic) object cache types explicitly, preserving all other (working) ones
+		// bug T113843
 		$GLOBALS['wgObjectCaches'] = array(
 			CACHE_NONE => $emptyCache,
 			CACHE_DB => $emptyCache,
 			CACHE_ANYTHING => $emptyCache,
 			CACHE_MEMCACHED => $emptyCache,
-		);
+		) + $GLOBALS['wgObjectCaches'];
 
 		// Load the installer's i18n.
 		$wgMessagesDirs['MediawikiInstaller'] = __DIR__ . '/i18n';
@@ -534,10 +536,16 @@ abstract class Installer {
 		// then some poorly-formed extensions try to call their own classes
 		// after immediately registering them. We really need to get extension
 		// registration out of the global scope and into a real format.
-		// @see https://bugzilla.wikimedia.org/67440
+		// @see https://phabricator.wikimedia.org/T69440
 		global $wgAutoloadClasses;
 		$wgAutoloadClasses = array();
 
+		// @codingStandardsIgnoreStart
+		// LocalSettings.php should not call functions, except wfLoadSkin/wfLoadExtensions
+		// Define the required globals here, to ensure, the functions can do it work correctly.
+		global $wgExtensionDirectory, $wgStyleDirectory;
+		// @codingStandardsIgnoreEnd
+
 		MediaWiki\suppressWarnings();
 		$_lsExists = file_exists( "$IP/LocalSettings.php" );
 		MediaWiki\restoreWarnings();
@@ -1473,7 +1481,7 @@ abstract class Installer {
 		 * want here is $wgHooks['LoadExtensionSchemaUpdates']. This won't work
 		 * if the extension has hidden hook registration in $wgExtensionFunctions,
 		 * but we're not opening that can of worms
-		 * @see https://bugzilla.wikimedia.org/show_bug.cgi?id=26857
+		 * @see https://phabricator.wikimedia.org/T28857
 		 */
 		global $wgAutoloadClasses;
 		$wgAutoloadClasses = array();
@@ -1742,7 +1750,7 @@ abstract class Installer {
 				User::newFromName( 'MediaWiki default' )
 			);
 		} catch ( Exception $e ) {
-			//using raw, because $wgShowExceptionDetails can not be set yet
+			// using raw, because $wgShowExceptionDetails can not be set yet
 			$status->fatal( 'config-install-mainpage-failed', $e->getMessage() );
 		}