Merge "Register a default value for the timecorrection preference"

diff --git a/includes/Setup.php b/includes/Setup.php
index cbe4e2e..97cba25 100644 (file)
--- 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;