dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97a0295
)
Followup r79545, we don't really care for duplicate userrights
author
Sam Reed
<reedy@users.mediawiki.org>
Tue, 4 Jan 2011 02:18:03 +0000
(
02:18
+0000)
committer
Sam Reed
<reedy@users.mediawiki.org>
Tue, 4 Jan 2011 02:18:03 +0000
(
02:18
+0000)
includes/api/ApiQueryAllUsers.php
patch
|
blob
|
history
diff --git
a/includes/api/ApiQueryAllUsers.php
b/includes/api/ApiQueryAllUsers.php
index
f538596
..
36f4f00
100644
(file)
--- a/
includes/api/ApiQueryAllUsers.php
+++ b/
includes/api/ApiQueryAllUsers.php
@@
-210,7
+210,8
@@
class ApiQueryAllUsers extends ApiQueryBase {
$lastUserData['rights'] = User::getGroupPermissions( User::getImplicitGroups() );
}
- $lastUserData['rights'] = array_merge( $lastUserData['rights'], User::getGroupPermissions( array( $row->ug_group2 ) ) );
+ $lastUserData['rights'] = array_unique( array_merge( $lastUserData['rights'],
+ User::getGroupPermissions( array( $row->ug_group2 ) ) ) );
$result->setIndexedTagName( $lastUserData['rights'], 'r' );
}
}