From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 1 Sep 2016 20:33:50 +0000 (+0000)
Subject: Merge "Register a default value for the timecorrection preference"
X-Git-Tag: 1.31.0-rc.0~5801
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=b9f443d6174d6ff8a9f1bdf93b4c9b886ef2b91c;hp=1b67dc0885f69f5595d1cd09a894a0a6fab297e4;p=lhc%2Fweb%2Fwiklou.git

Merge "Register a default value for the timecorrection preference"
---

diff --git a/includes/Setup.php b/includes/Setup.php
index cbe4e2e9d3..97cba2525c 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -638,6 +638,9 @@ date_default_timezone_set( $wgLocaltimezone );
 if ( is_null( $wgLocalTZoffset ) ) {
 	$wgLocalTZoffset = date( 'Z' ) / 60;
 }
+// The part after the System| is ignored, but rest of MW fills it
+// out as the local offset.
+$wgDefaultUserOptions['timecorrection'] = "System|$wgLocalTZoffset";
 
 if ( !$wgDBerrorLogTZ ) {
 	$wgDBerrorLogTZ = $wgLocaltimezone;