[TWiki-Dev] [SVN] HideyoImazu r29404 - twiki/branches/TWikiRelease06x00/core/lib/TWiki

[<de...@de...>]

Author: HideyoImazu
Date: 2015-07-14 00:35:11 +0000 (Tue, 14 Jul 2015)
New Revision: 29404
Trac url: http://develop.twiki.org/trac/changeset/29404

Modified:
   twiki/branches/TWikiRelease06x00/core/lib/TWiki/Time.pm
Log:
Item7676: TWiki::Time::formatTime() to observe outputTimeZone argument

Modified: twiki/branches/TWikiRelease06x00/core/lib/TWiki/Time.pm
===================================================================
--- twiki/branches/TWikiRelease06x00/core/lib/TWiki/Time.pm	2015-07-14 00:34:27 UTC (rev 29403)
+++ twiki/branches/TWikiRelease06x00/core/lib/TWiki/Time.pm	2015-07-14 00:35:11 UTC (rev 29404)
@@ -208,17 +208,22 @@
         ( $sec, $min, $hour, $day, $mon, $year, $wday ) = gmtime( $epochSeconds );
 
     } else {
-        my $tzSave = $ENV{TZ};
-        $ENV{TZ} = $outputTimeZone;
-        tzset();
+        my $tzSave;
+        if ( $outputTimeZone ) {
+            $tzSave = $ENV{TZ};
+            $ENV{TZ} = $outputTimeZone;
+            tzset();
+        }
         ( $sec, $min, $hour, $day, $mon, $year, $wday ) = localtime( $epochSeconds );
-        if ( defined($tzSave) ) {
-            $ENV{TZ} = $tzSave;
+        if ( $outputTimeZone ) {
+            if ( defined($tzSave) ) {
+                $ENV{TZ} = $tzSave;
+            }
+            else {
+                undef $ENV{TZ};
+            }
+            tzset();
         }
-        else {
-            undef $ENV{TZ};
-        }
-        tzset();
         if( $formatString =~ /(\$tz|iso)/i ) {
             # spcial case for local time zone offset calculation
             my( $tz_day, $tz_hour, $tz_min);