[MediaWiki-commits] [Gerrit] Stop using $wgUser (part 2) - change (mediawiki...DynamicSidebar)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Stop using $wgUser (part 2)
......................................................................


Stop using $wgUser (part 2)

Change-Id: I086b28f73babbb854fbc0292b855860f5de8b6f5
---
M DynamicSidebar.body.php
1 file changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/DynamicSidebar.body.php b/DynamicSidebar.body.php
index 1351b09..9c4b4ef 100644
--- a/DynamicSidebar.body.php
+++ b/DynamicSidebar.body.php
@@ -27,11 +27,11 @@
                }
                if ( $wgDynamicSidebarUseCategories && isset( 
$sidebar['CATEGORY-SIDEBAR'] ) ) {
                        self::printDebug( "Using category sidebar" );
-                       $skin->addToSidebarPlain( $catSB, 
self::doCategorySidebar() );
+                       $skin->addToSidebarPlain( $catSB, 
self::doCategorySidebar( $user ) );
                }
                if ( $wgDynamicSidebarUsePageCategories && isset( 
$sidebar['CATEGORY-SIDEBAR'] ) ) {
                        self::printDebug( "Using category sidebar" );
-                       $skin->addToSidebarPlain( $catSB, 
self::doPageCategorySidebar( $skin->getTitle() ) );
+                       $skin->addToSidebarPlain( $catSB, 
self::doPageCategorySidebar( $user, $skin->getTitle() ) );
                }
 
                $sidebar_copy = array();
@@ -117,25 +117,25 @@
        }
 
        /**
+        * @param User $user
         * @param Title $title
         * @return string
         */
-       private static function doPageCategorySidebar( $title ) {
-               return self::doCategorySidebar( $title->getParentCategories() );
+       private static function doPageCategorySidebar( User $user, $title ) {
+               return self::doCategorySidebar( $user, 
$title->getParentCategories() );
        }
 
        /**
         * Grabs the sidebar for the current user's categories
         *
+        * @param User $user
         * @param array|null $categories
         * @return string
         */
-       private static function doCategorySidebar( $categories = null ) {
-               global $wgUser;
-
-               self::printDebug( "User name: {$wgUser->getName()}" );
+       private static function doCategorySidebar( User $user, $categories = 
null ) {
+               self::printDebug( "User name: {$user->getName()}" );
                if( $categories === null ) {
-                       $categories = 
$wgUser->getUserPage()->getParentCategories();
+                       $categories = 
$user->getUserPage()->getParentCategories();
                }
 
                // Did we find any categories?

-- 
To view, visit https://gerrit.wikimedia.org/r/254361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I086b28f73babbb854fbc0292b855860f5de8b6f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DynamicSidebar
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits