From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 17 Jun 2010 09:39:07 +0000 (+0000)
Subject: Followup to r68157: simplify ApiQueryUsers::getAutoGroups()
X-Git-Tag: 1.31.0-rc.0~36482
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=a1db76daaf905df9959704ea4bad8a41decab237;p=lhc%2Fweb%2Fwiklou.git

Followup to r68157: simplify ApiQueryUsers::getAutoGroups()
---

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 82cdccae62..46aba7f59e 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -225,15 +225,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	* @return array
 	*/
 	public static function getAutoGroups( $user ) {
-		$autolist = array();
-		$autolist[] = "*";
-		$autolist[] = "user";
-
-		foreach( Autopromote::getAutopromoteGroups( $user ) as $group ) {
-			$autolist[] = $group;
-		}
-
-		return $autolist;
+		return array_merge( array( '*', 'user' ), Autopromote::getAutopromoteGroups( $user ) );
 	}
 
 	public function getAllowedParams() {