diff options
Diffstat (limited to 'includes/api/ApiQueryUsers.php')
| -rw-r--r-- | includes/api/ApiQueryUsers.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php index e2c47f54f2a3..f22c21340e34 100644 --- a/includes/api/ApiQueryUsers.php +++ b/includes/api/ApiQueryUsers.php @@ -110,7 +110,7 @@ class ApiQueryUsers extends ApiQueryBase { foreach ( $users as $u ) { $n = User::getCanonicalName( $u ); if ( $n === false || $n === '' ) { - $vals = array( 'name' => $u, 'invalid' => '' ); + $vals = array( 'name' => $u, 'invalid' => true ); $fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $vals ); if ( !$fit ) { @@ -190,7 +190,7 @@ class ApiQueryUsers extends ApiQueryBase { $data[$name]['rights'] = $user->getRights(); } if ( $row->ipb_deleted ) { - $data[$name]['hidden'] = ''; + $data[$name]['hidden'] = true; } if ( isset( $this->prop['blockinfo'] ) && !is_null( $row->ipb_by_text ) ) { $data[$name]['blockid'] = $row->ipb_id; @@ -201,8 +201,8 @@ class ApiQueryUsers extends ApiQueryBase { $data[$name]['blockexpiry'] = $row->ipb_expiry; } - if ( isset( $this->prop['emailable'] ) && $user->canReceiveEmail() ) { - $data[$name]['emailable'] = ''; + if ( isset( $this->prop['emailable'] ) ) { + $data[$name]['emailable'] = $user->canReceiveEmail(); } if ( isset( $this->prop['gender'] ) ) { @@ -237,7 +237,7 @@ class ApiQueryUsers extends ApiQueryBase { $iwUser = $urPage->fetchUser( $u ); if ( $iwUser instanceof UserRightsProxy ) { - $data[$u]['interwiki'] = ''; + $data[$u]['interwiki'] = true; if ( !is_null( $params['token'] ) ) { $tokenFunctions = $this->getTokenFunctions(); @@ -252,16 +252,19 @@ class ApiQueryUsers extends ApiQueryBase { } } } else { - $data[$u]['missing'] = ''; + $data[$u]['missing'] = true; } } else { if ( isset( $this->prop['groups'] ) && isset( $data[$u]['groups'] ) ) { + ApiResult::setArrayType( $data[$u]['groups'], 'array' ); ApiResult::setIndexedTagName( $data[$u]['groups'], 'g' ); } if ( isset( $this->prop['implicitgroups'] ) && isset( $data[$u]['implicitgroups'] ) ) { + ApiResult::setArrayType( $data[$u]['implicitgroups'], 'array' ); ApiResult::setIndexedTagName( $data[$u]['implicitgroups'], 'g' ); } if ( isset( $this->prop['rights'] ) && isset( $data[$u]['rights'] ) ) { + ApiResult::setArrayType( $data[$u]['rights'], 'array' ); ApiResult::setIndexedTagName( $data[$u]['rights'], 'r' ); } } |