Merge "Move pager inside searchresults div"

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

diff --git a/includes/resourceloader/ResourceLoaderUserModule.php b/includes/resourceloader/ResourceLoaderUserModule.php
index 90b4838..a097844 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserModule.php
+++ b/includes/resourceloader/ResourceLoaderUserModule.php
@@ -27,44 +27,37 @@
  */
 class ResourceLoaderUserModule extends ResourceLoaderWikiModule {
 
-       /* Protected Members */
-
        protected $origin = self::ORIGIN_USER_INDIVIDUAL;
 
-       /* Protected Methods */
-
        /**
+        * Get list of pages used by this module
+        *
         * @param ResourceLoaderContext $context
-        * @return array
+        * @return array List of pages
         */
        protected function getPages( ResourceLoaderContext $context ) {
-               global $wgAllowUserJs, $wgAllowUserCss;
-               $username = $context->getUser();
-
-               if ( $username === null ) {
+               $allowUserJs = $this->getConfig()->get( 'AllowUserJs' );
+               $allowUserCss = $this->getConfig()->get( 'AllowUserCss' );
+               if ( !$allowUserJs && !$allowUserCss ) {
                        return array();
                }
-               if ( !$wgAllowUserJs && !$wgAllowUserCss ) {
-                       return array();
-               }
-
-               // Get the normalized title of the user's user page
-               $userpageTitle = Title::makeTitleSafe( NS_USER, $username );
 
-               if ( !$userpageTitle instanceof Title ) {
+               $user = $context->getUserObj();
+               if ( !$user || $user->isAnon() ) {
                        return array();
                }
 
-               $userpage = $userpageTitle->getPrefixedDBkey(); // Needed so $excludepages works
+               // Needed so $excludepages works
+               $userPage = $user->getUserPage()->getPrefixedDBkey();
 
                $pages = array();
-               if ( $wgAllowUserJs ) {
-                       $pages["$userpage/common.js"] = array( 'type' => 'script' );
-                       $pages["$userpage/" . $context->getSkin() . '.js'] = array( 'type' => 'script' );
+               if ( $allowUserJs ) {
+                       $pages["$userPage/common.js"] = array( 'type' => 'script' );
+                       $pages["$userPage/" . $context->getSkin() . '.js'] = array( 'type' => 'script' );
                }
-               if ( $wgAllowUserCss ) {
-                       $pages["$userpage/common.css"] = array( 'type' => 'style' );
-                       $pages["$userpage/" . $context->getSkin() . '.css'] = array( 'type' => 'style' );
+               if ( $allowUserCss ) {
+                       $pages["$userPage/common.css"] = array( 'type' => 'style' );
+                       $pages["$userPage/" . $context->getSkin() . '.css'] = array( 'type' => 'style' );
                }
 
                // Hack for bug 26283: if we're on a preview page for a CSS/JS page,
@@ -79,9 +72,9 @@ class ResourceLoaderUserModule extends ResourceLoaderWikiModule {
                return $pages;
        }
 
-       /* Methods */
-
        /**
+        * Get group name
+        *
         * @return string
         */
        public function getGroup() {