From: Sam Reed Date: Tue, 4 Jan 2011 02:08:38 +0000 (+0000) Subject: Crappy spaces from r79549 X-Git-Tag: 1.31.0-rc.0~32841 X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=b30c1e7e722b14d5f2ed40ce447e2f0768418779;p=lhc%2Fweb%2Fwiklou.git Crappy spaces from r79549 --- diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php index 4e090e017c..596932270d 100644 --- a/includes/api/ApiQueryAllUsers.php +++ b/includes/api/ApiQueryAllUsers.php @@ -77,13 +77,13 @@ class ApiQueryAllUsers extends ApiQueryBase { $groups = array_merge( $groups, User::getGroupsWithPermission( $r ) ); } - $groups = array_diff( array_unique( $groups ), User::getImplicitGroups() ); + $groups = array_diff( array_unique( $groups ), User::getImplicitGroups() ); - if ( is_null( $params['group'] ) ) { + if ( is_null( $params['group'] ) ) { $params['group'] = $groups; - } else { + } else { $params['group'] = array_unique( array_merge( $params['group'], $groups ) ); - } + } } if ( !is_null( $params['group'] ) ) { @@ -205,14 +205,14 @@ class ApiQueryAllUsers extends ApiQueryBase { $result->setIndexedTagName( $lastUserData['groups'], 'g' ); } - if ( $fld_rights && !is_null( $row->ug_group2 ) ) { + if ( $fld_rights && !is_null( $row->ug_group2 ) ) { if ( !isset( $lastUserData['rights'] ) ) { $lastUserData['rights'] = User::getGroupPermissions( User::getImplicitGroups() ); - } + } - $lastUserData['rights'] = array_merge( $lastUserData['rights'], User::getGroupPermissions( array( $row->ug_group2 ) ) ); - $result->setIndexedTagName( $lastUserData['rights'], 'r' ); - } + $lastUserData['rights'] = array_merge( $lastUserData['rights'], User::getGroupPermissions( array( $row->ug_group2 ) ) ); + $result->setIndexedTagName( $lastUserData['rights'], 'r' ); + } } if ( is_array( $lastUserData ) ) {