From 6226bf666906dbef15a6325e8fa0a92e0b749445 Mon Sep 17 00:00:00 2001
From: Lucas Bartholemy <lucas.bartholemy@humhub.com>
Date: Thu, 27 Oct 2016 19:07:02 +0200
Subject: [PATCH] Ensure formatter timeZone is null when default is used

---
 protected/humhub/components/bootstrap/LanguageSelector.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/protected/humhub/components/bootstrap/LanguageSelector.php b/protected/humhub/components/bootstrap/LanguageSelector.php
index df0384d809..33145754ac 100644
--- a/protected/humhub/components/bootstrap/LanguageSelector.php
+++ b/protected/humhub/components/bootstrap/LanguageSelector.php
@@ -67,8 +67,9 @@ class LanguageSelector implements BootstrapInterface
             if ($app->user->language) {
                 $app->language = $app->user->language;
             }
-            
-            $app->formatter->timeZone = $app->user->timeZone;
+            if ($app->user->timeZone) {
+                $app->formatter->timeZone = $app->user->timeZone;
+            }
             $app->formatter->defaultTimeZone = $app->timeZone;
         }