From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 8 Feb 2011 05:33:17 +0000 (+0000)
Subject: Fix bug from r73645: setMsgBlobMtime() requires its timestamp parameter to be a UNIX... 
X-Git-Tag: 1.31.0-rc.0~32126
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=9bd321231b982ca20c0f6a59ae934b43d28eb69e;p=lhc%2Fweb%2Fwiklou.git

Fix bug from r73645: setMsgBlobMtime() requires its timestamp parameter to be a UNIX timestamp, which $row->mr_timestamp isn't. This was causing incorrect versions in the client-side module list, resulting in requests for URLs with "version=NaNNaNNaNTNaNNaNNaNZ", which Michael has been occasionally complaining about.
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index ba5ae11b95..91fb1ee4d8 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -95,7 +95,8 @@ class ResourceLoader {
 				), __METHOD__
 			);
 			foreach ( $res as $row ) {
-				$this->getModule( $row->mr_resource )->setMsgBlobMtime( $lang, $row->mr_timestamp );
+				$this->getModule( $row->mr_resource )->setMsgBlobMtime( $lang, 
+					wfTimestamp( TS_UNIX, $row->mr_timestamp ) );
 				unset( $modulesWithoutMessages[$row->mr_resource] );
 			}
 		}