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 "Fix @covers for FileBackend"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryAllImages.php
diff --git
a/includes/api/ApiQueryAllImages.php
b/includes/api/ApiQueryAllImages.php
index
e3e5ed6
..
ef6bb6a
100644
(file)
--- a/
includes/api/ApiQueryAllImages.php
+++ b/
includes/api/ApiQueryAllImages.php
@@
-197,7
+197,10
@@
class ApiQueryAllImages extends ApiQueryGeneratorBase {
'LEFT JOIN',
[
'ug_group' => User::getGroupsWithPermission( 'bot' ),
'LEFT JOIN',
[
'ug_group' => User::getGroupsWithPermission( 'bot' ),
- 'ug_user = img_user'
+ 'ug_user = img_user',
+ $this->getConfig()->get( 'DisableUserGroupExpiry' ) ?
+ '1' :
+ 'ug_expiry IS NULL OR ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
]
] ] );
$groupCond = ( $params['filterbots'] == 'nobots' ? 'NULL' : 'NOT NULL' );
]
] ] );
$groupCond = ( $params['filterbots'] == 'nobots' ? 'NULL' : 'NOT NULL' );