r56450 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r56449‎ | r56450 | r56451 >
Date:21:50, 16 September 2009
Author:brion
Status:ok
Tags:
Comment:
Merge r56447 and r56448: fixes needed for CentralAuth derived userrights module since changes to make fetchUser call static
Modified paths:
  • /branches/wmf-deployment/extensions/CentralAuth/SpecialGlobalGroupMembership.php (modified) (history)
  • /branches/wmf-deployment/includes/specials/SpecialUserrights.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/CentralAuth/SpecialGlobalGroupMembership.php
@@ -72,7 +72,7 @@
7373 }
7474 }
7575
76 - function fetchUser( $username ) {
 76+ static function fetchUser( $username ) {
7777 global $wgUser, $wgRequest;
7878
7979 $knownwiki = $wgRequest->getVal('wpKnownWiki');
Index: branches/wmf-deployment/includes/specials/SpecialUserrights.php
@@ -144,7 +144,7 @@
145145 function saveUserGroups( $username, $reason = '' ) {
146146 global $wgRequest, $wgUser, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
147147
148 - $user = $this->fetchUser( $username );
 148+ $user = self::fetchUser( $username );
149149 if( $user instanceof WikiErrorMsg ) {
150150 $wgOut->addWikiMsgArray( $user->getMessageKey(), $user->getMessageArgs() );
151151 return;
@@ -250,7 +250,7 @@
251251 function editUserGroupsForm( $username ) {
252252 global $wgOut;
253253
254 - $user = $this->fetchUser( $username );
 254+ $user = self::fetchUser( $username );
255255 if( $user instanceof WikiErrorMsg ) {
256256 $wgOut->addWikiMsgArray( $user->getMessageKey(), $user->getMessageArgs() );
257257 return;

Follow-up revisions

RevisionCommit summaryAuthorDate
r56515Revert r56450 (encompassing r56447 and r56448) and r56133 on wmf-deployment. ...werdna14:30, 17 September 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r56447r56133 made fetchUser staticmrzman21:37, 16 September 2009
r56448use fetchUser statically per r56133mrzman21:38, 16 September 2009

Status & tagging log