From: umherirrender <umherirrender_de.wp@web.de>
Date: Thu, 29 Jan 2015 16:13:04 +0000 (+0100)
Subject: Use Language::userTime in Preferences::datetimePreferences
X-Git-Tag: 1.31.0-rc.0~11738^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=2c7fa0d7cdc361c7f02d31cd5cce396692973c40;p=lhc%2Fweb%2Fwiklou.git

Use Language::userTime in Preferences::datetimePreferences

This avoids the indirect use of $wgUser

Change-Id: I951f5c4399dff6bb17c04e20dd9a7f763027b873
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 40c3a2b888..74a917dbab 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -657,8 +657,9 @@ class Preferences {
 		$now = wfTimestampNow();
 		$lang = $context->getLanguage();
 		$nowlocal = Xml::element( 'span', array( 'id' => 'wpLocalTime' ),
-			$lang->time( $now, true ) );
-		$nowserver = $lang->time( $now, false ) .
+			$lang->userTime( $now, $user ) );
+		$nowserver = $lang->userTime( $now, $user,
+				array( 'format' => false, 'timecorrection' => false ) ) .
 			Html::hidden( 'wpServerTime', (int)substr( $now, 8, 2 ) * 60 + (int)substr( $now, 10, 2 ) );
 
 		$defaultPreferences['nowserver'] = array(