}
if ( isset( $this->prop['groups'] ) ) {
- $vals['groups'] = $wgUser->getGroups();
+ $autolist = ApiQueryUsers::getAutoGroups( $wgUser );
+
+ $vals['groups'] = array_merge( $autolist, $wgUser->getGroups() );
$result->setIndexedTagName( $vals['groups'], 'g' ); // even if empty
}
}
} else {
if ( isset( $this->prop['groups'] ) && isset( $data[$u]['groups'] ) ) {
- $autolist = array();
- $autolist[] = "*";
- foreach( Autopromote::getAutopromoteGroups( User::newFromName( $u ) ) as $group ) {
- $autolist[] = $group;
- }
+ $autolist = ApiQueryUsers::getAutoGroups( User::newFromName( $u ) );
$data[$u]['groups'] = array_merge( $autolist, $data[$u]['groups'] );
}
return $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'user' );
}
+
+ public static function getAutoGroups( $user ) {
+ $autolist = array();
+ $autolist[] = "*";
+ $autolist[] = "user";
+
+ foreach( Autopromote::getAutopromoteGroups( $user ) as $group ) {
+ $autolist[] = $group;
+ }
+
+ return $autolist;
+ }
public function getAllowedParams() {
return array(
global $wgOut, $wgUser, $wgLang;
$list = array();
- foreach( $groups as $group )
+ foreach( $groups as $group ) {
$list[] = self::buildGroupLink( $group );
+ }
$autolist = array();
if ( $user instanceof User ) {