From 036351d36238e39bfdf9c262d11ee9f5d58c1c0f Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 16 Feb 2009 17:47:54 +0000 Subject: [PATCH] API: Fix yet another regression from r46845 that completely broke list=users. Patch by Brad Jorsch --- includes/api/ApiQueryUsers.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php index 42bb15d53a..9b92f4c86a 100644 --- a/includes/api/ApiQueryUsers.php +++ b/includes/api/ApiQueryUsers.php @@ -120,11 +120,18 @@ if (!defined('MEDIAWIKI')) { // Second pass: add result data to $retval foreach($goodNames as $u) { if(!isset($data[$u])) - $retval[] = array('name' => $u, 'missing' => ''); + $data[$u] = array('name' => $u, 'missing' => ''); else { if(isset($this->prop['groups']) && isset($data[$u]['groups'])) $this->getResult()->setIndexedTagName($data[$u]['groups'], 'g'); - $retval[] = $data[$u]; + } + $fit = $result->addValue(array('query', $this->getModuleName()), + null, $data[$u]); + if(!$fit) + { + $this->setContinueEnumParameter('users', + implode('|', array_diff($users, $done))); + break; } $done[] = $u; } -- 2.20.1