X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=maintenance%2FcleanupBlocks.php;h=37417c73d18c33a3929c4d250ee0e664ecf912bf;hb=3488f495321a01f808eebf87e90b6fb334817d81;hp=7a3034fb78b0e5bcb3dc1a8866ca8d1e23abb5bf;hpb=a5be382adfdad4678eec18413c6a118cb3284daf;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/cleanupBlocks.php b/maintenance/cleanupBlocks.php index 7a3034fb78..37417c73d1 100644 --- a/maintenance/cleanupBlocks.php +++ b/maintenance/cleanupBlocks.php @@ -39,6 +39,7 @@ class CleanupBlocks extends Maintenance { public function execute() { $db = $this->getDB( DB_MASTER ); + $blockQuery = Block::getQueryInfo(); $max = $db->selectField( 'ipblocks', 'MAX(ipb_user)' ); @@ -65,11 +66,14 @@ class CleanupBlocks extends Maintenance { foreach ( $res as $row ) { $bestBlock = null; $res2 = $db->select( - 'ipblocks', - '*', + $blockQuery['tables'], + $blockQuery['fields'], [ 'ipb_user' => $row->ipb_user, - ] + ], + __METHOD__, + [], + $blockQuery['joins'] ); foreach ( $res2 as $row2 ) { $block = Block::newFromRow( $row2 );