merge most of r56515 back to trunk (changing UserrightsPage::fetchUser to non-static)

Fixing ApiQueryUsers so it should work properly for interwiki users

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 9ae63c4..7bc8cdb 100644 (file)
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -172,7 +172,8 @@ if (!defined('MEDIAWIKI')) {
                foreach($goodNames as $u) {
                        if(!isset($data[$u])) {
                                $data[$u] = array('name' => $u);
-                               $iwUser = UserrightsPage::fetchUser($u);
+                               $urPage = new UserrightsPage;
+                               $iwUser = $urPage->fetchUser($u);
                                if($iwUser instanceof UserRightsProxy) {
                                        $data[$u]['interwiki'] = '';
                                        if(!is_null($params['token']))

diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index b2a2825..c65db97 100644 (file)
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -44,8 +44,9 @@ class ApiUserrights extends ApiBase {
                        $this->dieUsageMsg(array('missingparam', 'user'));
                if(is_null($params['token']))
                        $this->dieUsageMsg(array('missingparam', 'token'));
-               
-               $user = UserrightsPage::fetchUser($params['user']);
+
+               $form = new UserrightsPage;
+               $user = $form->fetchUser($params['user']);
                if($user instanceof WikiErrorMsg)
                        $this->dieUsageMsg(array_merge(
                                (array)$user->getMessageKey(),

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index f8cae80..cd10217 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -144,7 +144,7 @@ class UserrightsPage extends SpecialPage {
        function saveUserGroups( $username, $reason = '' ) {
                global $wgRequest, $wgUser, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
 
-               $user = self::fetchUser( $username );
+               $user = $this->fetchUser( $username );
                if( $user instanceof WikiErrorMsg ) {
                        $wgOut->addWikiMsgArray( $user->getMessageKey(), $user->getMessageArgs() );
                        return;
@@ -250,7 +250,7 @@ class UserrightsPage extends SpecialPage {
        function editUserGroupsForm( $username ) {
                global $wgOut;
 
-               $user = self::fetchUser( $username );
+               $user = $this->fetchUser( $username );
                if( $user instanceof WikiErrorMsg ) {
                        $wgOut->addWikiMsgArray( $user->getMessageKey(), $user->getMessageArgs() );
                        return;
@@ -272,7 +272,7 @@ class UserrightsPage extends SpecialPage {
         * Side effects: error output for invalid access
         * @return mixed User, UserRightsProxy, or WikiErrorMsg
         */
-       public static function fetchUser( $username ) {
+       public function fetchUser( $username ) {
                global $wgUser, $wgUserrightsInterwikiDelimiter;
 
                $parts = explode( $wgUserrightsInterwikiDelimiter, $username );