Merge branch 'hotfix/i18n-view-dateformat' into releases/2.0.1

Conflicts: README.md
zendframework · Aug 31, 2012 · f383ca9 · f383ca9
commit f383ca9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/View/Helper/DateFormat.php b/src/View/Helper/DateFormat.php
@@ -69,6 +69,10 @@ public function setTimezone($timezone)
      */
     public function getTimezone()
     {
+        if (!$this->timezone) {
+            return date_default_timezone_get();
+        }
+
         return $this->timezone;
     }