From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 10 May 2017 01:41:22 +0000 (-0700)
Subject: Make loadWatchedItem() coerce the DB timestamp to TS_MW
X-Git-Tag: 1.31.0-rc.0~3283^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=676b0c89dd609e2c980afd522dfbdf18a9903e3c;p=lhc%2Fweb%2Fwiklou.git

Make loadWatchedItem() coerce the DB timestamp to TS_MW

Bug: T75174
Change-Id: Ie72bd17b424ba857d0b4a22227c9cffad0853050
---

diff --git a/includes/WatchedItemStore.php b/includes/WatchedItemStore.php
index 17728fa33e..228f93b9b4 100644
--- a/includes/WatchedItemStore.php
+++ b/includes/WatchedItemStore.php
@@ -467,7 +467,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 		$item = new WatchedItem(
 			$user,
 			$target,
-			$row->wl_notificationtimestamp
+			wfTimestampOrNull( TS_MW, $row->wl_notificationtimestamp )
 		);
 		$this->cache( $item );