Merge "Include action in permission error messages"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderSiteModule.php

diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php b/includes/resourceloader/ResourceLoaderSiteModule.php
index 05754d3..1d9721a 100644 (file)
--- 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';