X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupBlocks.php;h=15bb4f3edee3b263c07877cf2ea99896f94916b2;hb=dad735ed09bb4cd686c9ef97b6238bae1876c043;hp=cbf008415e2e199e2350548219ff6c12b3493be5;hpb=925c20a9ca669c67cc44f4468d0e0f3b33b94213;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupBlocks.php b/maintenance/cleanupBlocks.php
index cbf008415e..15bb4f3ede 100644
--- a/maintenance/cleanupBlocks.php
+++ b/maintenance/cleanupBlocks.php
@@ -92,11 +92,12 @@ class CleanupBlocks extends Maintenance {
 						$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();
 						}
 					}