r57065 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r57064‎ | r57065 | r57066 >
Date:17:30, 29 September 2009
Author:brion
Status:ok
Tags:
Comment:
merge from trunk r57064 regression fix
Modified paths:
  • /branches/wmf-deployment/includes/specials/SpecialUserrights.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/includes/specials/SpecialUserrights.php
@@ -54,7 +54,6 @@
5555 } else {
5656 $this->mTarget = $wgRequest->getVal( 'user' );
5757 }
58 - $this->mTarget = User::getCanonicalName( $this->mTarget );
5958
6059 /*
6160 * If the user is blocked and they only have "partial" access
@@ -312,6 +311,12 @@
313312 if( !$name ) {
314313 return new WikiErrorMsg( 'noname' );
315314 }
 315+ } else {
 316+ $name = User::getCanonicalName( $name );
 317+ if( !$name ) {
 318+ // invalid name
 319+ return new WikiErrorMsg( 'nosuchusershort', $username );
 320+ }
316321 }
317322
318323 if( $database == '' ) {
Property changes on: branches/wmf-deployment/includes/specials/SpecialUserrights.php
___________________________________________________________________
Name: svn:mergeinfo
319324 + /branches/REL1_15/phase3/includes/specials/SpecialUserrights.php:51646
/branches/wmf-deployment/includes/specials/SpecialUserrights.php:53381
/trunk/phase3/includes/specials/SpecialUserrights.php:56188,57064

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r57064Fix regression from r54429 "(bug 17864 + bug 19519) - Do input normalization ...brion17:27, 29 September 2009

Status & tagging log