Merge "SpecialUserrights: Use session data instead of URL parameter for success"

diff --combined includes/specials/SpecialUserrights.php
index 1d9c057,89dcdad..df98f33
--- 1/includes/specials/SpecialUserrights.php
--- 2/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@@ -76,6 -76,7 +76,7 @@@ class UserrightsPage extends SpecialPag
        public function execute( $par ) {
                $user = $this->getUser();
                $request = $this->getRequest();
+               $session = $request->getSession();
                $out = $this->getOutput();
  
                if ( $par !== null ) {
@@@ -88,10 -89,6 +89,10 @@@
                        $this->mTarget = trim( $this->mTarget );
                }
  
 +              if ( $this->mTarget !== null && User::getCanonicalName( $this->mTarget ) === $user->getName() ) {
 +                      $this->isself = true;
 +              }
 +
                $fetchedStatus = $this->fetchUser( $this->mTarget, true );
                if ( $fetchedStatus->isOK() ) {
                        $this->mFetchedUser = $fetchedStatus->value;
@@@ -103,7 -100,13 +104,13 @@@
                }
  
                // show a successbox, if the user rights was saved successfully
-               if ( $request->getCheck( 'success' ) && $this->mFetchedUser !== null ) {
+               if (
+                       $session->get( 'specialUserrightsSaveSuccess' ) &&
+                       $this->mFetchedUser !== null
+               ) {
+                       // Remove session data for the success message
+                       $session->remove( 'specialUserrightsSaveSuccess' );
+ 
                        $out->addModules( [ 'mediawiki.special.userrights' ] );
                        $out->addModuleStyles( 'mediawiki.notification.convertmessagebox.styles' );
                        $out->addHTML(
@@@ -171,6 -174,9 +178,9 @@@
                                        $targetUser
                                );
  
+                               // Set session data for the success message
+                               $session->set( 'specialUserrightsSaveSuccess', 1 );
+ 
                                $out->redirect( $this->getSuccessURL() );
  
                                return;
@@@ -184,7 -190,7 +194,7 @@@
        }
  
        function getSuccessURL() {
-               return $this->getPageTitle( $this->mTarget )->getFullURL( [ 'success' => 1 ] );
+               return $this->getPageTitle( $this->mTarget )->getFullURL();
        }
  
        /**
@@@ -335,7 -341,7 +345,7 @@@
         * @param bool $writing
         * @return Status
         */
 -      public function fetchUser( $username, $writing ) {
 +      public function fetchUser( $username, $writing = true ) {
                $parts = explode( $this->getConfig()->get( 'UserrightsInterwikiDelimiter' ), $username );
                if ( count( $parts ) < 2 ) {
                        $name = trim( $username );
@@@ -553,14 -559,9 +563,14 @@@
                        Xml::element(
                                'legend',
                                [],
 -                              $this->msg( 'userrights-editusergroup', $user->getName() )->text()
 +                              $this->msg(
 +                                      $canChangeAny ? 'userrights-editusergroup' : 'userrights-viewusergroup',
 +                                      $user->getName()
 +                              )->text()
                        ) .
 -                      $this->msg( 'editinguser' )->params( wfEscapeWikiText( $user->getName() ) )
 +                      $this->msg(
 +                              $canChangeAny ? 'editinguser' : 'viewinguserrights'
 +                      )->params( wfEscapeWikiText( $user->getName() ) )
                                ->rawParams( $userToolLinks )->parse()
                );
                if ( $canChangeAny ) {