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
Replace selectFields() methods with getQueryInfo()
[lhc/web/wiklou.git]
/
maintenance
/
cleanupBlocks.php
diff --git
a/maintenance/cleanupBlocks.php
b/maintenance/cleanupBlocks.php
index
7a3034f
..
37417c7
100644
(file)
--- a/
maintenance/cleanupBlocks.php
+++ b/
maintenance/cleanupBlocks.php
@@
-39,6
+39,7
@@
class CleanupBlocks extends Maintenance {
public function execute() {
$db = $this->getDB( DB_MASTER );
public function execute() {
$db = $this->getDB( DB_MASTER );
+ $blockQuery = Block::getQueryInfo();
$max = $db->selectField( 'ipblocks', 'MAX(ipb_user)' );
$max = $db->selectField( 'ipblocks', 'MAX(ipb_user)' );
@@
-65,11
+66,14
@@
class CleanupBlocks extends Maintenance {
foreach ( $res as $row ) {
$bestBlock = null;
$res2 = $db->select(
foreach ( $res as $row ) {
$bestBlock = null;
$res2 = $db->select(
-
'ipblocks'
,
-
'*'
,
+
$blockQuery['tables']
,
+
$blockQuery['fields']
,
[
'ipb_user' => $row->ipb_user,
[
'ipb_user' => $row->ipb_user,
- ]
+ ],
+ __METHOD__,
+ [],
+ $blockQuery['joins']
);
foreach ( $res2 as $row2 ) {
$block = Block::newFromRow( $row2 );
);
foreach ( $res2 as $row2 ) {
$block = Block::newFromRow( $row2 );