From: Alex Monk Date: Fri, 26 Jun 2015 18:03:15 +0000 (+0100) Subject: UserrightsPage: Avoid passing null target X-Git-Tag: 1.31.0-rc.0~10948 X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=d7059cc033b9974e90d335b7045dca0f6604b28c;p=lhc%2Fweb%2Fwiklou.git UserrightsPage: Avoid passing null target Bug: T103945 Change-Id: I80598ce6d12a73a7a3c399fbacc2a253999177b2 --- diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index ab539515d2..0158fdb3eb 100644 --- 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; } @@ -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