Merge "Return array without holes from User::getAllGroups"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 31 Jul 2018 17:23:42 +0000 (17:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 31 Jul 2018 17:23:42 +0000 (17:23 +0000)
includes/user/User.php

index 8ebd2d2..5e57a18 100644 (file)
@@ -5073,10 +5073,10 @@ class User implements IDBAccessObject, UserIdentity {
         */
        public static function getAllGroups() {
                global $wgGroupPermissions, $wgRevokePermissions;
-               return array_diff(
+               return array_values( array_diff(
                        array_merge( array_keys( $wgGroupPermissions ), array_keys( $wgRevokePermissions ) ),
                        self::getImplicitGroups()
-               );
+               ) );
        }
 
        /**