Merge "Add tests for SkinTemplate::setupSkinUserCss"

diff --combined includes/skins/SkinTemplate.php
index 1a0317a,578d418..bc6dfca
--- 1/includes/skins/SkinTemplate.php
--- 2/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@@ -61,7 -61,7 +61,7 @@@ class SkinTemplate extends Skin 
         *
         * @param OutputPage $out
         */
-       function setupSkinUserCss( OutputPage $out ) {
+       public function setupSkinUserCss( OutputPage $out ) {
                $moduleStyles = [
                        'mediawiki.legacy.shared',
                        'mediawiki.legacy.commonPrint',
@@@ -1283,7 -1283,7 +1283,7 @@@
                                'href' => $this->getTitle()->getLocalURL( "action=info" )
                        ];
  
 -                      if ( $this->getTitle()->exists() ) {
 +                      if ( $this->getTitle()->exists() || $this->getTitle()->inNamespace( NS_CATEGORY ) ) {
                                $nav_urls['recentchangeslinked'] = [
                                        'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalURL()
                                ];
@@@ -1322,11 -1322,11 +1322,11 @@@
                        if ( !$user->isAnon() ) {
                                $sur = new UserrightsPage;
                                $sur->setContext( $this->getContext() );
 -                              $canChange = $sur->userCanChangeRights( $this->getUser(), false );
 +                              $canChange = $sur->userCanChangeRights( $user );
                                $nav_urls['userrights'] = [
                                        'text' => $this->msg(
                                                $canChange ? 'tool-link-userrights' : 'tool-link-userrights-readonly',
 -                                              $this->getUser()->getName()
 +                                              $rootUser
                                        )->text(),
                                        'href' => self::makeSpecialUrlSubpage( 'Userrights', $rootUser )
                                ];