Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234452
Change subject: Fix "array_merge() expects at least 1 parameter, 0 given"
warning on Special:GlobalUsers
......................................................................
Fix "array_merge() expects at least 1 parameter, 0 given" warning on
Special:GlobalUsers
This is my fault from my comment on I1483e14b PS1
Change-Id: I5af42d99335750af2820bc281538213fe51f61fb
---
M includes/specials/SpecialGlobalUsers.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/52/234452/1
diff --git a/includes/specials/SpecialGlobalUsers.php
b/includes/specials/SpecialGlobalUsers.php
index 04fee0e..d5cd141 100644
--- a/includes/specials/SpecialGlobalUsers.php
+++ b/includes/specials/SpecialGlobalUsers.php
@@ -166,7 +166,10 @@
$batch->execute();
// Make an array of global groups for all users in the current
result set
- $globalGroups = call_user_func_array( 'array_merge',
array_values( $this->globalIDGroups ) );
+ $globalGroups = array();
+ foreach ( $this->globalIDGroups as $id => $gugGroup ) {
+ $globalGroups = array_merge( $globalGroups, $gugGroup );
+ }
if ( count( $globalGroups ) > 0 ) {
$wsQuery = $this->mDb->select(
array( 'global_group_restrictions',
'wikiset' ),
--
To view, visit https://gerrit.wikimedia.org/r/234452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5af42d99335750af2820bc281538213fe51f61fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
