Merge "language: Use item 'fallbackSequence' instead of duplicating logic"

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

diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 680c74c..417cfce 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -25,36 +25,23 @@
  */
 class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
 
-       /* Protected Members */
-
        protected $origin = self::ORIGIN_USER_SITEWIDE;
        protected $targets = array( 'desktop', 'mobile' );
 
-       /* Protected Methods */
-
        /**
         * @param ResourceLoaderContext $context
         * @return array
         */
        protected function getPages( ResourceLoaderContext $context ) {
-               global $wgUser, $wgUseSiteJs, $wgUseSiteCss;
-
-               $userName = $context->getUser();
-               if ( $userName === null ) {
-                       return array();
-               }
-               if ( !$wgUseSiteJs && !$wgUseSiteCss ) {
+               $useSiteJs = $this->getConfig()->get( 'UseSiteJs' );
+               $useSiteCss = $this->getConfig()->get( 'UseSiteCss' );
+               if ( !$useSiteJs && !$useSiteCss ) {
                        return array();
                }
 
-               // Use $wgUser is possible; allows to skip a lot of code
-               if ( is_object( $wgUser ) && $wgUser->getName() == $userName ) {
-                       $user = $wgUser;
-               } else {
-                       $user = User::newFromName( $userName );
-                       if ( !$user instanceof User ) {
-                               return array();
-                       }
+               $user = $context->getUserObj();
+               if ( !$user || $user->isAnon() ) {
+                       return array();
                }
 
                $pages = array();
@@ -62,19 +49,19 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
                        if ( $group == '*' ) {
                                continue;
                        }
-                       if ( $wgUseSiteJs ) {
+                       if ( $useSiteJs ) {
                                $pages["MediaWiki:Group-$group.js"] = array( 'type' => 'script' );
                        }
-                       if ( $wgUseSiteCss ) {
+                       if ( $useSiteCss ) {
                                $pages["MediaWiki:Group-$group.css"] = array( 'type' => 'style' );
                        }
                }
                return $pages;
        }
 
-       /* Methods */
-
        /**
+        * Get group name
+        *
         * @return string
         */
        public function getGroup() {