X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=a7e8c0bc68df8da87c8a59088a959a5aafb8d174;hb=8a5687d34467c36d3893327a458b83cad726de83;hp=12e782d34f3af4d53f8980304a740a773c52a3de;hpb=da42dd58e76f2355a33d4f4d57d1e56c0cf2e9f4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 12e782d34f..a7e8c0bc68 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -46,6 +46,7 @@ use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Preferences\PreferencesFactory;
 use MediaWiki\Preferences\DefaultPreferencesFactory;
 use MediaWiki\Revision\MainSlotRoleHandler;
@@ -149,7 +150,10 @@ return [
 		$lbConf = MWLBFactory::applyDefaultConfig(
 			$mainConfig->get( 'LBFactoryConf' ),
 			$mainConfig,
-			$services->getConfiguredReadOnlyMode()
+			$services->getConfiguredReadOnlyMode(),
+			$services->getLocalServerObjectCache(),
+			$services->getMainObjectStash(),
+			$services->getMainWANObjectCache()
 		);
 		$class = MWLBFactory::getLBFactoryClass( $lbConf );
 
@@ -200,12 +204,12 @@ return [
 	},
 
 	'LinkRenderer' => function ( MediaWikiServices $services ) : LinkRenderer {
-		global $wgUser;
-
 		if ( defined( 'MW_NO_SESSION' ) ) {
 			return $services->getLinkRendererFactory()->create();
 		} else {
-			return $services->getLinkRendererFactory()->createForUser( $wgUser );
+			return $services->getLinkRendererFactory()->createForUser(
+				RequestContext::getMain()->getUser()
+			);
 		}
 	},
 
@@ -364,7 +368,8 @@ return [
 			$services->getContentLanguage(),
 			wfUrlProtocols(),
 			$services->getSpecialPageFactory(),
-			$services->getMainConfig()
+			$services->getMainConfig(),
+			$services->getLinkRendererFactory()
 		);
 	},
 
@@ -386,6 +391,16 @@ return [
 		);
 	},
 
+	'PermissionManager' => function ( MediaWikiServices $services ) : PermissionManager {
+		$config = $services->getMainConfig();
+		return new PermissionManager(
+			$services->getSpecialPageFactory(),
+			$config->get( 'WhitelistRead' ),
+			$config->get( 'WhitelistReadRegexp' ),
+			$config->get( 'EmailConfirmToEdit' ),
+			$config->get( 'BlockDisablesLogin' ) );
+	},
+
 	'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
 		$factory = new DefaultPreferencesFactory(
 			$services->getMainConfig(),
@@ -414,10 +429,17 @@ return [
 	},
 
 	'ResourceLoader' => function ( MediaWikiServices $services ) : ResourceLoader {
-		return new ResourceLoader(
-			$services->getMainConfig(),
+		global $IP;
+		$config = $services->getMainConfig();
+
+		$rl = new ResourceLoader(
+			$config,
 			LoggerFactory::getInstance( 'resourceloader' )
 		);
+		$rl->addSource( $config->get( 'ResourceLoaderSources' ) );
+		$rl->register( include "$IP/resources/Resources.php" );
+
+		return $rl;
 	},
 
 	'RevisionFactory' => function ( MediaWikiServices $services ) : RevisionFactory {