From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/resourceloader/ResourceLoaderSiteModule.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'includes/resourceloader/ResourceLoaderSiteModule.php')

diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php b/includes/resourceloader/ResourceLoaderSiteModule.php
index 05754d37..1d9721aa 100644
--- a/includes/resourceloader/ResourceLoaderSiteModule.php
+++ b/includes/resourceloader/ResourceLoaderSiteModule.php
@@ -32,19 +32,17 @@ class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
 	/**
 	 * Gets list of pages used by this module
 	 *
-	 * @param $context ResourceLoaderContext
+	 * @param ResourceLoaderContext $context
 	 *
-	 * @return Array: List of pages
+	 * @return array List of pages
 	 */
 	protected function getPages( ResourceLoaderContext $context ) {
-		global $wgUseSiteJs, $wgUseSiteCss;
-
 		$pages = array();
-		if ( $wgUseSiteJs ) {
+		if ( $this->getConfig()->get( 'UseSiteJs' ) ) {
 			$pages['MediaWiki:Common.js'] = array( 'type' => 'script' );
 			$pages['MediaWiki:' . ucfirst( $context->getSkin() ) . '.js'] = array( 'type' => 'script' );
 		}
-		if ( $wgUseSiteCss ) {
+		if ( $this->getConfig()->get( 'UseSiteCss' ) ) {
 			$pages['MediaWiki:Common.css'] = array( 'type' => 'style' );
 			$pages['MediaWiki:' . ucfirst( $context->getSkin() ) . '.css'] = array( 'type' => 'style' );
 
@@ -58,7 +56,7 @@ class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
 	/**
 	 * Gets group name
 	 *
-	 * @return String: Name of group
+	 * @return string Name of group
 	 */
 	public function getGroup() {
 		return 'site';
-- 
cgit v1.2.3-54-g00ecf