From 2c7fa0d7cdc361c7f02d31cd5cce396692973c40 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Thu, 29 Jan 2015 17:13:04 +0100 Subject: [PATCH] Use Language::userTime in Preferences::datetimePreferences This avoids the indirect use of $wgUser Change-Id: I951f5c4399dff6bb17c04e20dd9a7f763027b873 --- includes/Preferences.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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( -- 2.20.1