Restore default timezone if the provided one is invalid.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4513 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 4 insertions, 4 deletions

diff --git a/pmwiki.php b/pmwiki.php
index 4e75fc2a..88da34c7 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -704,6 +704,10 @@ function PSFT($fmt, $stamp=null, $locale=null, $tz=null) { # strftime() replacem
     $fmt = preg_replace('/(?<!%)(%L)/', $gmt, $fmt);
   }
 
+  if ($tz) {
+    $tzo = @timezone_open($tz);
+    if (!@$tzo) unset($tz);
+  }
   if (! $cached['new']) {
     if (@$locale) 
       setlocale(LC_TIME, preg_split('/[, ]+/', $locale, -1, PREG_SPLIT_NO_EMPTY));
@@ -718,10 +722,6 @@ function PSFT($fmt, $stamp=null, $locale=null, $tz=null) { # strftime() replacem
   }
   
   $timestamp = date_create("@$stamp");
-  if ($tz) {
-    $tzo = @timezone_open($tz);
-    if (!@$tzo) unset($tz);
-  }
   if (!@$tz) { # need to set it otherwise resets to GMT
     $tz = $cached['dtz'];
     $tzo = $cached['dtzo'];