Merge "Don't check namespace in SpecialWantedtemplates"

[lhc/web/wiklou.git] / includes / specials / SpecialUserrights.php

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 785a844..0158fdb 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -106,7 +106,7 @@ class UserrightsPage extends SpecialPage {
                        }
                }
 
-               if ( User::getCanonicalName( $this->mTarget ) === $user->getName() ) {
+               if ( $this->mTarget !== null && User::getCanonicalName( $this->mTarget ) === $user->getName() ) {
                        $this->isself = true;
                }
 
@@ -135,7 +135,7 @@ class UserrightsPage extends SpecialPage {
 
                $out = $this->getOutput();
                $out->addModuleStyles( 'mediawiki.special' );
-               $out->addHelpLink( 'Help:Assigning permissions' );
+               $this->addHelpLink( 'Help:Assigning permissions' );
 
                // show the general form
                if ( count( $available['add'] ) || count( $available['remove'] ) ) {
@@ -145,6 +145,7 @@ class UserrightsPage extends SpecialPage {
                if (
                        $request->wasPosted() &&
                        $request->getCheck( 'saveusergroups' ) &&
+                       $this->mTarget !== null &&
                        $user->matchEditToken( $request->getVal( 'wpEditToken' ), $this->mTarget )
                ) {
                        // save settings
@@ -249,7 +250,7 @@ class UserrightsPage extends SpecialPage {
                if ( $remove ) {
                        foreach ( $remove as $index => $group ) {
                                if ( !$user->removeGroup( $group ) ) {
-                                       unset($remove[$index]);
+                                       unset( $remove[$index] );
                                }
                        }
                        $newGroups = array_diff( $newGroups, $remove );
@@ -257,7 +258,7 @@ class UserrightsPage extends SpecialPage {
                if ( $add ) {
                        foreach ( $add as $index => $group ) {
                                if ( !$user->addGroup( $group ) ) {
-                                       unset($add[$index]);
+                                       unset( $add[$index] );
                                }
                        }
                        $newGroups = array_merge( $newGroups, $add );