dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
e8a9780
)
Merge "Avoid calling Block::deleteIfExpired() when not needed"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Jan 2016 23:22:11 +0000
(23:22 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Tue, 5 Jan 2016 23:22:11 +0000
(23:22 +0000)
includes/Block.php
patch
|
blob
|
history
diff --git
a/includes/Block.php
b/includes/Block.php
index
4729f50
..
7b287dc
100644
(file)
--- a/
includes/Block.php
+++ b/
includes/Block.php
@@
-296,7
+296,7
@@
class Block {
$block = self::newFromRow( $row );
# Don't use expired blocks
- if ( $block->
deleteIf
Expired() ) {
+ if ( $block->
is
Expired() ) {
continue;
}
@@
-1140,7
+1140,7
@@
class Block {
$blocks = array();
foreach ( $rows as $row ) {
$block = self::newFromRow( $row );
- if ( !$block->
deleteIf
Expired() ) {
+ if ( !$block->
is
Expired() ) {
$blocks[] = $block;
}
}