Index: trunk/phase3/includes/api/ApiQueryUsers.php |
— | — | @@ -120,12 +120,19 @@ |
121 | 121 | // Second pass: add result data to $retval |
122 | 122 | foreach($goodNames as $u) { |
123 | 123 | if(!isset($data[$u])) |
124 | | - $retval[] = array('name' => $u, 'missing' => ''); |
| 124 | + $data[$u] = array('name' => $u, 'missing' => ''); |
125 | 125 | else { |
126 | 126 | if(isset($this->prop['groups']) && isset($data[$u]['groups'])) |
127 | 127 | $this->getResult()->setIndexedTagName($data[$u]['groups'], 'g'); |
128 | | - $retval[] = $data[$u]; |
129 | 128 | } |
| 129 | + $fit = $result->addValue(array('query', $this->getModuleName()), |
| 130 | + null, $data[$u]); |
| 131 | + if(!$fit) |
| 132 | + { |
| 133 | + $this->setContinueEnumParameter('users', |
| 134 | + implode('|', array_diff($users, $done))); |
| 135 | + break; |
| 136 | + } |
130 | 137 | $done[] = $u; |
131 | 138 | } |
132 | 139 | return $this->getResult()->setIndexedTagName_internal(array('query', $this->getModuleName()), 'user'); |