[otrs-cvs] otrs/Kernel Language.pm,1.83,1.84

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

Modified Files:
	Language.pm 
Log Message:
Fixed bug#8942 - Dates show UTC offset on systems with Timezone support activated.

Author: mb

Index: Language.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Language.pm,v
retrieving revision 1.83
retrieving revision 1.84
diff -2 -u -d -r1.83 -r1.84
--- Language.pm	20 Nov 2012 14:26:19 -0000	1.83
+++ Language.pm	24 Nov 2012 13:18:20 -0000	1.84
@@ -358,5 +358,5 @@
 
         # add user time zone diff
-        if ( $Self->{TimeZone} ) {
+        if ( $Self->{TimeZone} && $Config ne 'DateFormatShort' ) {
             my $TimeStamp = $Self->{TimeObject}->TimeStamp2SystemTime( String => "$Y-$M-$D $T", );
             $TimeStamp = $TimeStamp + ( $Self->{TimeZone} * 60 * 60 );
@@ -374,5 +374,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