| Index: trunk/phase3/includes/api/ApiQueryAllUsers.php |
| — | — | @@ -77,13 +77,13 @@ |
| 78 | 78 | $groups = array_merge( $groups, User::getGroupsWithPermission( $r ) ); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | | - $groups = array_diff( array_unique( $groups ), User::getImplicitGroups() ); |
| | 81 | + $groups = array_diff( array_unique( $groups ), User::getImplicitGroups() ); |
| 82 | 82 | |
| 83 | | - if ( is_null( $params['group'] ) ) { |
| | 83 | + if ( is_null( $params['group'] ) ) { |
| 84 | 84 | $params['group'] = $groups; |
| 85 | | - } else { |
| | 85 | + } else { |
| 86 | 86 | $params['group'] = array_unique( array_merge( $params['group'], $groups ) ); |
| 87 | | - } |
| | 87 | + } |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | if ( !is_null( $params['group'] ) ) { |
| — | — | @@ -205,14 +205,14 @@ |
| 206 | 206 | $result->setIndexedTagName( $lastUserData['groups'], 'g' ); |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | | - if ( $fld_rights && !is_null( $row->ug_group2 ) ) { |
| | 209 | + if ( $fld_rights && !is_null( $row->ug_group2 ) ) { |
| 210 | 210 | if ( !isset( $lastUserData['rights'] ) ) { |
| 211 | 211 | $lastUserData['rights'] = User::getGroupPermissions( User::getImplicitGroups() ); |
| 212 | | - } |
| | 212 | + } |
| 213 | 213 | |
| 214 | | - $lastUserData['rights'] = array_merge( $lastUserData['rights'], User::getGroupPermissions( array( $row->ug_group2 ) ) ); |
| 215 | | - $result->setIndexedTagName( $lastUserData['rights'], 'r' ); |
| 216 | | - } |
| | 214 | + $lastUserData['rights'] = array_merge( $lastUserData['rights'], User::getGroupPermissions( array( $row->ug_group2 ) ) ); |
| | 215 | + $result->setIndexedTagName( $lastUserData['rights'], 'r' ); |
| | 216 | + } |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | if ( is_array( $lastUserData ) ) { |