Merge "(bug 32297) Use symbolic names, not offsets for a default timezone."

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index b531f2a..b026fad 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1758,7 +1758,7 @@ class Language {
         * @return int
         */
        function userAdjust( $ts, $tz = false ) {
-               global $wgUser, $wgLocalTZoffset;
+               global $wgUser, $wgLocaltimezone, $wgLocalTZoffset;
 
                if ( $tz === false ) {
                        $tz = $wgUser->getOption( 'timecorrection' );
@@ -1766,6 +1766,18 @@ class Language {
 
                $data = explode( '|', $tz, 3 );
 
+               if ( $data[0] == 'System' || $tz == '' ) {
+                       # Global timezone
+                       if ( isset( $wgLocaltimezone ) ) {
+                               $data[0] = 'ZoneInfo';
+                               $data[2] = $wgLocaltimezone;
+                       }
+                       #  Global offset in minutes.
+                       if ( isset( $wgLocalTZoffset ) ) {
+                               $data[1] = $wgLocalTZoffset;
+                       }
+               }
+
                if ( $data[0] == 'ZoneInfo' ) {
                        wfSuppressWarnings();
                        $userTZ = timezone_open( $data[2] );
@@ -1781,12 +1793,7 @@ class Language {
                }
 
                $minDiff = 0;
-               if ( $data[0] == 'System' || $tz == '' ) {
-                       #  Global offset in minutes.
-                       if ( isset( $wgLocalTZoffset ) ) {
-                               $minDiff = $wgLocalTZoffset;
-                       }
-               } elseif ( $data[0] == 'Offset' ) {
+               if ( $data[0] == 'Offset' ) {
                        $minDiff = intval( $data[1] );
                } else {
                        $data = explode( ':', $tz );