r50095 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r50094‎ | r50095 | r50096 >
Date:06:31, 1 May 2009
Author:tstarling
Status:deferred
Tags:
Comment:
* Backported r48993: fixes fatal error in CentralAuth.
Modified paths:
  • /branches/REL1_15/extensions/CentralAuth (modified) (history)
  • /branches/REL1_15/extensions/CentralAuth/SpecialGlobalGroupMembership.php (modified) (history)
  • /branches/REL1_15/phase3/includes (modified) (history)
  • /branches/REL1_15/phase3/includes/specials (modified) (history)
  • /branches/REL1_15/phase3/includes/specials/SpecialUserrights.php (modified) (history)

Diff [purge]

Index: branches/REL1_15/extensions/CentralAuth/SpecialGlobalGroupMembership.php
@@ -15,6 +15,13 @@
1616 global $wgUser;
1717 $this->mGlobalUser = CentralAuthUser::getInstance( $wgUser );
1818 }
 19+
 20+ function getSuccessURL() {
 21+ global $wgRequest;
 22+ $knownWikis = $this->mGlobalUser->listAttached();
 23+ $title = $this->getTitle( $this->mTarget );
 24+ return $title->getFullURL( 'wpKnownWiki='.urlencode( $knownWikis[0] ) );
 25+ }
1926
2027 /**
2128 * Output a form to allow searching for a user
Property changes on: branches/REL1_15/extensions/CentralAuth
___________________________________________________________________
Name: svn:mergeinfo
2229 + /trunk/extensions/CentralAuth:48993
Index: branches/REL1_15/phase3/includes/specials/SpecialUserrights.php
@@ -105,7 +105,7 @@
106106
107107 global $wgOut;
108108
109 - $url = $this->getTitle( $this->mTarget )->getFullURL();
 109+ $url = $this->getSuccessURL();
110110 $wgOut->redirect( $url );
111111 return;
112112 }
@@ -117,6 +117,10 @@
118118 $this->editUserGroupsForm( $this->mTarget );
119119 }
120120 }
 121+
 122+ function getSuccessURL() {
 123+ return $this->getTitle( $this->mTarget )->getFullURL();
 124+ }
121125
122126 /**
123127 * Save user groups changes in the database.
Property changes on: branches/REL1_15/phase3/includes/specials
___________________________________________________________________
Name: svn:mergeinfo
124128 + /trunk/phase3/includes/specials:48993,49051,49068,49086,49682,49775
/trunk/phase3/includes/specials/specials:48993
Property changes on: branches/REL1_15/phase3/includes
___________________________________________________________________
Name: svn:mergeinfo
125129 + /trunk/phase3/includes:49051,49068,49086,49682,49775
/trunk/phase3/includes/specials:48993

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r48993Fix regression whereby you were shown an error message after submitting Globa...werdna11:34, 29 March 2009

Status & tagging log