[otrs-cvs] otrs/Kernel Language.pm,1.85,1.86

Comments:
Update of /home/cvs/otrs/Kernel
In directory lancelot:/tmp/cvs-serv28663/Kernel

Modified Files:
	Language.pm 
Log Message:
Re-applied fix from Michiel.

Author: mg

Index: Language.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Language.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -2 -u -d -r1.85 -r1.86
--- Language.pm	26 Nov 2012 08:29:58 -0000	1.85
+++ Language.pm	26 Nov 2012 09:28:52 -0000	1.86
@@ -357,6 +357,7 @@
         my ( $Y, $M, $D, $T ) = ( $1, $2, $3, $4 );
 
-        # add user time zone diff
-        if ( $Self->{TimeZone} ) {
+        # Add user time zone diff, but only if we actually display the time!
+        # Otherwise the date might be off by one day because of the TimeZone diff.
+        if ( $Self->{TimeZone} && $Config ne 'DateFormatShort' ) {
             my $TimeStamp = $Self->{TimeObject}->TimeStamp2SystemTime( String => "$Y-$M-$D $T", );
             $TimeStamp = $TimeStamp + ( $Self->{TimeZone} * 60 * 60 );
@@ -374,5 +375,5 @@
         $ReturnString =~ s/\%M/$M/g;
         $ReturnString =~ s/\%Y/$Y/g;
-        if ( $Self->{TimeZone} ) {
+        if ( $Self->{TimeZone} && $Config ne 'DateFormatShort' ) {
             return $ReturnString . " ($Self->{TimeZone})";
         }
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log