From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 4 May 2018 00:23:39 +0000 (+0100)
Subject: skins: Update core skins to queue modules via getDefaultModules()
X-Git-Tag: 1.34.0-rc.0~5464
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=5eecdb53f8b79f7a8e4ce25d958f9330bae28e0f;p=lhc%2Fweb%2Fwiklou.git

skins: Update core skins to queue modules via getDefaultModules()

Following I3404c1c2a7e, update the core skins to use
getDefaultModules() instead of the now-deprecated setupSkinUserCss().

Change-Id: I48b76938f46c1b6b683b618e7571e6fc6876cc52
---

diff --git a/includes/skins/SkinApi.php b/includes/skins/SkinApi.php
index 6966ff71be..38d94e4b3a 100644
--- a/includes/skins/SkinApi.php
+++ b/includes/skins/SkinApi.php
@@ -32,9 +32,10 @@ class SkinApi extends SkinTemplate {
 	public $skinname = 'apioutput';
 	public $template = SkinApiTemplate::class;
 
-	public function setupSkinUserCss( OutputPage $out ) {
-		parent::setupSkinUserCss( $out );
-		$out->addModuleStyles( 'mediawiki.skinning.interface' );
+	public function getDefaultModules() {
+		$modules = parent::getDefaultModules();
+		$modules['styles']['skin'][] = 'mediawiki.skinning.interface';
+		return $modules;
 	}
 
 	// Skip work and hooks for stuff we don't use
diff --git a/includes/skins/SkinFallback.php b/includes/skins/SkinFallback.php
index d5f764c6e4..09042f0317 100644
--- a/includes/skins/SkinFallback.php
+++ b/includes/skins/SkinFallback.php
@@ -2,8 +2,6 @@
 /**
  * Skin file for the fallback skin.
  *
- * The structure is copied from the example skin (mediawiki/skins/Example).
- *
  * @since 1.24
  * @file
  */
@@ -16,14 +14,10 @@ class SkinFallback extends SkinTemplate {
 	public $skinname = 'fallback';
 	public $template = SkinFallbackTemplate::class;
 
-	/**
-	 * Add CSS via ResourceLoader
-	 *
-	 * @param OutputPage $out
-	 */
-	public function setupSkinUserCss( OutputPage $out ) {
-		parent::setupSkinUserCss( $out );
-		$out->addModuleStyles( 'mediawiki.skinning.interface' );
+	public function getDefaultModules() {
+		$modules = parent::getDefaultModules();
+		$modules['styles']['skin'][] = 'mediawiki.skinning.interface';
+		return $modules;
 	}
 
 	/**