dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
d7e93ff
)
Merge "Use Language::userTime in Preferences::datetimePreferences"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Sat, 11 Apr 2015 23:51:59 +0000
(23:51 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Sat, 11 Apr 2015 23:51:59 +0000
(23:51 +0000)
includes/Preferences.php
patch
|
blob
|
history
diff --git
a/includes/Preferences.php
b/includes/Preferences.php
index
40c3a2b
..
74a917d
100644
(file)
--- 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(