From 592eb90345b2abdcc4fa31c6e440233dc5d88935 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sun, 11 Sep 2005 13:43:49 +0000 Subject: [PATCH] faster expiry check in enumBlocks --- includes/Block.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/includes/Block.php b/includes/Block.php index da44e60b9a..4151f25c20 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -204,11 +204,13 @@ class Block $cond = ''; } + $now = wfTimestampNow(); + extract( $db->tableNames( 'ipblocks', 'user' ) ); $sql = "SELECT $ipblocks.*,user_name FROM $ipblocks,$user " . "WHERE user_id=ipb_by $cond ORDER BY ipb_timestamp DESC $options"; - $res = $db->query( $sql, 'Block::enumBans' ); + $res = $db->query( $sql, 'Block::enumBlocks' ); $num_rows = $db->numRows( $res ); while ( $row = $db->fetchObject( $res ) ) { @@ -218,7 +220,9 @@ class Block } if ( !( $flags & EB_KEEP_EXPIRED ) ) { - if ( !$block->deleteIfExpired() ) { + if ( $block->mExpiry && $now > $block->mExpiry ) { + $block->delete(); + } else { call_user_func( $callback, $block, $tag ); } } else { -- 2.20.1