From 5eecdb53f8b79f7a8e4ce25d958f9330bae28e0f Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 4 May 2018 01:23:39 +0100 Subject: [PATCH] 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 --- includes/skins/SkinApi.php | 7 ++++--- includes/skins/SkinFallback.php | 14 ++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) 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; } /** -- 2.20.1