From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 3 Mar 2016 02:48:08 +0000 (-0800)
Subject: Use ipb_id when updating expiry in Block::updateTimestamp()
X-Git-Tag: 1.31.0-rc.0~7668
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=f4635a95e7ab7479c3e5a15fb1d47f1a5609340a;p=lhc%2Fweb%2Fwiklou.git

Use ipb_id when updating expiry in Block::updateTimestamp()

If Block::purgeExpired() hasn't been called due to low traffic, already
expired blocks might have their timestamps extended.

Bug: T128695
Change-Id: I21e7dca57bda77a755b54d0e09f340c3f0e75bd6
---

diff --git a/includes/Block.php b/includes/Block.php
index 764592d0cd..b8e900d90a 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -844,7 +844,7 @@ class Block {
 					'ipb_expiry' => $dbw->timestamp( $this->mExpiry ),
 				],
 				[ /* WHERE */
-					'ipb_address' => (string)$this->getTarget()
+					'ipb_id' => $this->getId(),
 				],
 				__METHOD__
 			);