X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderClientHtml.php;h=b8f2fa53e19be58339095eb63531cc5d82a4db0e;hb=efafb74daf6a3be5353cc06ce4b8574daa6c9aef;hp=91e0b02087848441b6e24aaceef5f044cdda6904;hpb=8f0a0ce08563a55d76efa2e969dce536bdf1dfec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php b/includes/resourceloader/ResourceLoaderClientHtml.php
index 91e0b02087..b8f2fa53e1 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -56,7 +56,7 @@ class ResourceLoaderClientHtml {
 
 	/**
 	 * @param ResourceLoaderContext $context
-	 * @param aray $target [optional] Custom 'target' parameter for the startup module
+	 * @param string|null $target [optional] Custom 'target' parameter for the startup module
 	 */
 	public function __construct( ResourceLoaderContext $context, $target = null ) {
 		$this->context = $context;
@@ -170,7 +170,7 @@ class ResourceLoaderClientHtml {
 
 			if ( $module->getType() !== ResourceLoaderModule::LOAD_STYLES ) {
 				$logger = $rl->getLogger();
-				$logger->debug( 'Unexpected general module "{module}" in styles queue.', [
+				$logger->warning( 'Unexpected general module "{module}" in styles queue.', [
 					'module' => $name,
 				] );
 			} else {
@@ -365,7 +365,11 @@ class ResourceLoaderClientHtml {
 		$rl = $mainContext->getResourceLoader();
 		$chunks = [];
 
+		// Sort module names so requests are more uniform
+		sort( $modules );
+
 		if ( $mainContext->getDebug() && count( $modules ) > 1 ) {
+
 			$chunks = [];
 			// Recursively call us for every item
 			foreach ( $modules as $name ) {
@@ -374,8 +378,6 @@ class ResourceLoaderClientHtml {
 			return new WrappedStringList( "\n", $chunks );
 		}
 
-		// Sort module names so requests are more uniform
-		sort( $modules );
 		// Create keyed-by-source and then keyed-by-group list of module objects from modules list
 		$sortedModules = [];
 		foreach ( $modules as $name ) {
@@ -415,7 +417,7 @@ class ResourceLoaderClientHtml {
 				// Special handling for the user group; because users might change their stuff
 				// on-wiki like user pages, or user preferences; we need to find the highest
 				// timestamp of these user-changeable modules so we can ensure cache misses on change
-				// This should NOT be done for the site group (bug 27564) because anons get that too
+				// This should NOT be done for the site group (T29564) because anons get that too
 				// and we shouldn't be putting timestamps in CDN-cached HTML
 				if ( $group === 'user' ) {
 					// Must setModules() before makeVersionQuery()