From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 10 Apr 2010 12:29:44 +0000 (+0000)
Subject: Revert r64825
X-Git-Tag: 1.31.0-rc.0~37168
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=9a141fbab513916271f61296f39cdcf06b4ebb6f;p=lhc%2Fweb%2Fwiklou.git

Revert r64825
---

diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index be6d76c2d0..25254d70a8 100644
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -40,7 +40,8 @@ class ApiUserrights extends ApiBase {
 		$params = $this->extractRequestParams();
 
 		// User already validated in call to getTokenSalt from Main
-		$user = $this->mForm->fetchUser( $params['user'] );
+		$form = new UserrightsPage;
+		$user = $form->fetchUser( $params['user'] );
 
 		$r['user'] = $user->getName();
 		list( $r['added'], $r['removed'] ) =
@@ -107,8 +108,8 @@ class ApiUserrights extends ApiBase {
 			$this->dieUsageMsg( array( 'missingparam', 'user' ) );
 		}
 
-		$this->mForm = new UserrightsPage;
-		$user = $this->mForm->fetchUser( $params['user'] );
+		$form = new UserrightsPage;
+		$user = $form->fetchUser( $params['user'] );
 		if ( $user instanceof WikiErrorMsg ) {
 			$this->dieUsageMsg( array_merge(
 				(array)$user->getMessageKey(), $user->getMessageArgs() ) );