Merge "Use camel case for variable names in Article.php"

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

diff --git a/includes/resourceloader/ResourceLoaderUserModule.php b/includes/resourceloader/ResourceLoaderUserModule.php
index 7454b65..1b6d1de 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserModule.php
+++ b/includes/resourceloader/ResourceLoaderUserModule.php
@@ -34,17 +34,20 @@ class ResourceLoaderUserModule extends ResourceLoaderWikiModule {
        /* Protected Methods */
 
        /**
-        * @param $context ResourceLoaderContext
+        * @param ResourceLoaderContext $context
         * @return array
         */
        protected function getPages( ResourceLoaderContext $context ) {
-               global $wgAllowUserJs, $wgAllowUserCss;
                $username = $context->getUser();
 
                if ( $username === null ) {
                        return array();
                }
-               if ( !$wgAllowUserJs && !$wgAllowUserCss ) {
+
+               $allowUserJs = $this->getConfig()->get( 'AllowUserJs' );
+               $allowUserCss = $this->getConfig()->get( 'AllowUserCss' );
+
+               if ( !$allowUserJs && !$allowUserCss ) {
                        return array();
                }
 
@@ -58,11 +61,11 @@ class ResourceLoaderUserModule extends ResourceLoaderWikiModule {
                $userpage = $userpageTitle->getPrefixedDBkey(); // Needed so $excludepages works
 
                $pages = array();
-               if ( $wgAllowUserJs ) {
+               if ( $allowUserJs ) {
                        $pages["$userpage/common.js"] = array( 'type' => 'script' );
                        $pages["$userpage/" . $context->getSkin() . '.js'] = array( 'type' => 'script' );
                }
-               if ( $wgAllowUserCss ) {
+               if ( $allowUserCss ) {
                        $pages["$userpage/common.css"] = array( 'type' => 'style' );
                        $pages["$userpage/" . $context->getSkin() . '.css'] = array( 'type' => 'style' );
                }