Merge "Fix case of $wgLocalTZoffset from 7e3386d4"

diff --git a/includes/Timestamp.php b/includes/Timestamp.php
index ba9b7b2..92e914e 100644 (file)
--- a/includes/Timestamp.php
+++ b/includes/Timestamp.php
@@ -213,7 +213,7 @@ class MWTimestamp {
         * @return DateInterval Offset that was applied to the timestamp
         */
        public function offsetForUser( User $user ) {
-               global $wgLocalTZOffset;
+               global $wgLocalTZoffset;
 
                $option = $user->getOption( 'timecorrection' );
                $data = explode( '|', $option, 3 );
@@ -239,8 +239,8 @@ class MWTimestamp {
                // first value.
                if ( $data[0] == 'System' ) {
                        // First value is System, so use the system offset.
-                       if ( isset( $wgLocalTZOffset ) ) {
-                               $diff = $wgLocalTZOffset;
+                       if ( isset( $wgLocalTZoffset ) ) {
+                               $diff = $wgLocalTZoffset;
                        }
                } elseif ( $data[0] == 'Offset' ) {
                        // First value is Offset, so use the specified offset