X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=includes%2Fregistration%2FExtensionRegistry.php;h=07fe3186be6827d31bab373e7fc28f2b42d28010;hb=7c9f1a122712362b5840aee0325e36b249cb79db;hp=9cae73c90779b7fcfa61e31e54ec7513fe172aad;hpb=5b202d729d540bdabbf74c3faf8e3ce5e946cbb1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index 9cae73c907..07fe3186be 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -146,7 +146,7 @@ class ExtensionRegistry {
 	 *  be loaded then).
 	 */
 	public function loadFromQueue() {
-		global $wgVersion, $wgDevelopmentWarnings;
+		global $wgVersion, $wgDevelopmentWarnings, $wgObjectCaches;
 		if ( !$this->queued ) {
 			return;
 		}
@@ -169,10 +169,9 @@ class ExtensionRegistry {
 		// We use a try/catch because we don't want to fail here
 		// if $wgObjectCaches is not configured properly for APC setup
 		try {
-			// Don't use MediaWikiServices here to prevent instantiating it before extensions have
-			// been loaded
+			// Avoid MediaWikiServices to prevent instantiating it before extensions have loaded
 			$cacheId = ObjectCache::detectLocalServerCache();
-			$cache = ObjectCache::newFromId( $cacheId );
+			$cache = ObjectCache::newFromParams( $wgObjectCaches[$cacheId] );
 		} catch ( InvalidArgumentException $e ) {
 			$cache = new EmptyBagOStuff();
 		}
@@ -307,16 +306,6 @@ class ExtensionRegistry {
 				$autoloadNamespaces
 			);
 
-			if ( isset( $info['AutoloadClasses'] ) ) {
-				$autoload = $this->processAutoLoader( $dir, $info['AutoloadClasses'] );
-				$GLOBALS['wgAutoloadClasses'] += $autoload;
-				$autoloadClasses += $autoload;
-			}
-			if ( isset( $info['AutoloadNamespaces'] ) ) {
-				$autoloadNamespaces += $this->processAutoLoader( $dir, $info['AutoloadNamespaces'] );
-				AutoLoader::$psr4Namespaces += $autoloadNamespaces;
-			}
-
 			// get all requirements/dependencies for this extension
 			$requires = $processor->getRequirements( $info, $this->checkDev );