X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderContext.php;h=c3948cbdca130569f7bc8ba3f7c012c0798efc85;hb=ebee3194736bebc06b22770f52602d0154244929;hp=95a81e6d4b8831ac90729e3b864e145a5d5d4a8c;hpb=86a1f6f080a116ebe69728401f1a0391b494cc59;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php
index 95a81e6d4b..c3948cbdca 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -66,8 +66,8 @@ class ResourceLoaderContext implements MessageLocalizer {
 		$this->request = $request;
 		$this->logger = $resourceLoader->getLogger();
 
-		// Future developers: Use WebRequest::getRawVal() instead of getVal().
-		// The getVal() method performs slow Language+UTF logic. (f303bb9360)
+		// Optimisation: Use WebRequest::getRawVal() instead of getVal(). We don't
+		// need the slow Language+UTF logic meant for user input here. (f303bb9360)
 
 		// List of modules
 		$modules = $request->getRawVal( 'modules' );
@@ -76,8 +76,8 @@ class ResourceLoaderContext implements MessageLocalizer {
 		// Various parameters
 		$this->user = $request->getRawVal( 'user' );
 		$this->debug = $request->getRawVal( 'debug' ) === 'true';
-		$this->only = $request->getRawVal( 'only', null );
-		$this->version = $request->getRawVal( 'version', null );
+		$this->only = $request->getRawVal( 'only' );
+		$this->version = $request->getRawVal( 'version' );
 		$this->raw = $request->getFuzzyBool( 'raw' );
 
 		// Image requests
@@ -95,19 +95,6 @@ class ResourceLoaderContext implements MessageLocalizer {
 		}
 	}
 
-	/**
-	 * Reverse the process done by ResourceLoader::makePackedModulesString().
-	 *
-	 * @deprecated since 1.33 Use ResourceLoader::expandModuleNames instead.
-	 * @param string $modules Packed module name list
-	 * @return array Array of module names
-	 * @codeCoverageIgnore
-	 */
-	public static function expandModuleNames( $modules ) {
-		wfDeprecated( __METHOD__, '1.33' );
-		return ResourceLoader::expandModuleNames( $modules );
-	}
-
 	/**
 	 * Return a dummy ResourceLoaderContext object suitable for passing into
 	 * things that don't "really" need a context.
@@ -140,8 +127,10 @@ class ResourceLoaderContext implements MessageLocalizer {
 	 * @deprecated since 1.34 Use ResourceLoaderModule::getConfig instead
 	 * inside module methods. Use ResourceLoader::getConfig elsewhere.
 	 * @return Config
+	 * @codeCoverageIgnore
 	 */
 	public function getConfig() {
+		wfDeprecated( __METHOD__, '1.34' );
 		return $this->getResourceLoader()->getConfig();
 	}
 
@@ -410,4 +399,24 @@ class ResourceLoaderContext implements MessageLocalizer {
 		}
 		return $this->hash;
 	}
+
+	/**
+	 * Get the request base parameters, omitting any defaults.
+	 *
+	 * @internal For internal use by ResourceLoaderStartUpModule only
+	 * @return array
+	 */
+	public function getReqBase() {
+		$reqBase = [];
+		if ( $this->getLanguage() !== self::DEFAULT_LANG ) {
+			$reqBase['lang'] = $this->getLanguage();
+		}
+		if ( $this->getSkin() !== self::DEFAULT_SKIN ) {
+			$reqBase['skin'] = $this->getSkin();
+		}
+		if ( $this->getDebug() ) {
+			$reqBase['debug'] = 'true';
+		}
+		return $reqBase;
+	}
 }