From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 4 Aug 2015 01:38:30 +0000 (-0700)
Subject: resourceloader: In startup, move RLQ handling to after mw.config
X-Git-Tag: 1.31.0-rc.0~10533
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=fdb29e8d3244553fc63cd0dad8895cafed17641a;p=lhc%2Fweb%2Fwiklou.git

resourceloader: In startup, move RLQ handling to after mw.config

Follows-up 59f1a1efa8.

This wasn't breaking anything currently because the startup module
is still loading synchronously.

Change-Id: I2c91331050378f2b5925e89b3aab50a555c07bcd
---

diff --git a/resources/src/startup.js b/resources/src/startup.js
index 1332459409..97fa1342b9 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -76,6 +76,10 @@ function startUp() {
 
 	$CODE.registrations();
 
+	mw.config.set( $VARS.configuration );
+
+	// Must be after mw.config.set because these callbacks may use mw.loader which
+	// needs to have values 'skin', 'debug' etc. from mw.config.
 	window.RLQ = window.RLQ || [];
 	while ( RLQ.length ) {
 		RLQ.shift()();
@@ -85,8 +89,6 @@ function startUp() {
 			fn();
 		}
 	};
-
-	mw.config.set( $VARS.configuration );
 }
 
 // Conditional script injection