require_once __DIR__ . '/Maintenance.php';
+use MediaWiki\Block\DatabaseBlock;
+
/**
* Maintenance script to clean up user blocks with user names not matching the
* 'user' table.
public function execute() {
$db = $this->getDB( DB_MASTER );
- $blockQuery = Block::getQueryInfo();
+ $blockQuery = DatabaseBlock::getQueryInfo();
$max = $db->selectField( 'ipblocks', 'MAX(ipb_user)' );
$blockQuery['joins']
);
foreach ( $res2 as $row2 ) {
- $block = Block::newFromRow( $row2 );
+ $block = DatabaseBlock::newFromRow( $row2 );
if ( !$bestBlock ) {
$bestBlock = $block;
continue;
}
// Find the most-restrictive block. Can't use
- // Block::chooseBlock because that's for IP blocks, not
+ // DatabaseBlock::chooseBlock because that's for IP blocks, not
// user blocks.
$keep = null;
if ( $keep === null && $block->getExpiry() !== $bestBlock->getExpiry() ) {
$keep = $block->getExpiry() > $bestBlock->getExpiry();
}
if ( $keep === null ) {
- foreach ( [ 'createaccount', 'sendemail', 'editownusertalk' ] as $action ) {
- if ( $block->prevents( $action ) xor $bestBlock->prevents( $action ) ) {
- $keep = $block->prevents( $action );
- break;
- }
+ if ( $block->isCreateAccountBlocked() xor $bestBlock->isCreateAccountBlocked() ) {
+ $keep = $block->isCreateAccountBlocked();
+ } elseif ( $block->isEmailBlocked() xor $bestBlock->isEmailBlocked() ) {
+ $keep = $block->isEmailBlocked();
+ } elseif ( $block->isUsertalkEditAllowed() xor $bestBlock->isUsertalkEditAllowed() ) {
+ $keep = $block->isUsertalkEditAllowed();
}
}
}
}
-$maintClass = "CleanupBlocks";
+$maintClass = CleanupBlocks::class;
require_once RUN_MAINTENANCE_IF_MAIN;