dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Document what ParserOutput::setProperty() is for"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryAllUsers.php
diff --git
a/includes/api/ApiQueryAllUsers.php
b/includes/api/ApiQueryAllUsers.php
index
1e29a64
..
79f6469
100644
(file)
--- a/
includes/api/ApiQueryAllUsers.php
+++ b/
includes/api/ApiQueryAllUsers.php
@@
-81,12
+81,18
@@
class ApiQueryAllUsers extends ApiQueryBase {
$db->buildLike( $this->getCanonicalUserName( $params['prefix'] ), $db->anyString() ) );
}
$db->buildLike( $this->getCanonicalUserName( $params['prefix'] ), $db->anyString() ) );
}
- if ( !is_null( $params['rights'] ) ) {
+ if ( !is_null( $params['rights'] )
&& count( $params['rights'] )
) {
$groups = array();
foreach( $params['rights'] as $r ) {
$groups = array_merge( $groups, User::getGroupsWithPermission( $r ) );
}
$groups = array();
foreach( $params['rights'] as $r ) {
$groups = array_merge( $groups, User::getGroupsWithPermission( $r ) );
}
+ // no group with the given right(s) exists, no need for a query
+ if( !count( $groups ) ) {
+ $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), '' );
+ return;
+ }
+
$groups = array_unique( $groups );
if ( is_null( $params['group'] ) ) {
$groups = array_unique( $groups );
if ( is_null( $params['group'] ) ) {
@@
-152,7
+158,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
'INNER JOIN', 'rc_user_text=user_name'
) ) );
'INNER JOIN', 'rc_user_text=user_name'
) ) );
- $this->addFields(
'COUNT(*) AS recentedits'
);
+ $this->addFields(
array( 'recentedits' => 'COUNT(*)' )
);
$this->addWhere( 'rc_log_type IS NULL OR rc_log_type != ' . $db->addQuotes( 'newusers' ) );
$timestamp = $db->timestamp( wfTimestamp( TS_UNIX ) - $wgActiveUserDays*24*3600 );
$this->addWhere( 'rc_log_type IS NULL OR rc_log_type != ' . $db->addQuotes( 'newusers' ) );
$timestamp = $db->timestamp( wfTimestamp( TS_UNIX ) - $wgActiveUserDays*24*3600 );
@@
-252,7
+258,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
if ( $fld_groups ) {
if ( !isset( $lastUserData['groups'] ) ) {
if ( $lastUserObj ) {
if ( $fld_groups ) {
if ( !isset( $lastUserData['groups'] ) ) {
if ( $lastUserObj ) {
- $lastUserData['groups'] =
ApiQueryUsers::getAutoGroups( $lastUserObj
);
+ $lastUserData['groups'] =
$lastUserObj->getAutomaticGroups(
);
} else {
// This should not normally happen
$lastUserData['groups'] = array();
} else {
// This should not normally happen
$lastUserData['groups'] = array();
@@
-267,7
+273,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
}
if ( $fld_implicitgroups && !isset( $lastUserData['implicitgroups'] ) && $lastUserObj ) {
}
if ( $fld_implicitgroups && !isset( $lastUserData['implicitgroups'] ) && $lastUserObj ) {
- $lastUserData['implicitgroups'] =
ApiQueryUsers::getAutoGroups( $lastUserObj
);
+ $lastUserData['implicitgroups'] =
$lastUserObj->getAutomaticGroups(
);
$result->setIndexedTagName( $lastUserData['implicitgroups'], 'g' );
}
if ( $fld_rights ) {
$result->setIndexedTagName( $lastUserData['implicitgroups'], 'g' );
}
if ( $fld_rights ) {