From a22fbfc60f36f5f7ee10d5ae6fe347340c2ee67c Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 09:20:55 +0100
Subject: Update to MediaWiki 1.17.1

---
 includes/resourceloader/ResourceLoaderUserOptionsModule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes/resourceloader/ResourceLoaderUserOptionsModule.php')

diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index ae654b8f..61c76940 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -40,7 +40,7 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 		global $wgUser;
 
 		if ( $context->getUser() === $wgUser->getName() ) {
-			return $this->modifiedTime[$hash] = $wgUser->getTouched();
+			return $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $wgUser->getTouched() );
 		} else {
 			return 1;
 		}
-- 
cgit v1.2.3-54-g00ecf