[Jifty-commit] r2231 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: falcone
Date: Thu Nov 30 18:04:09 2006
New Revision: 2231

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/DateTime.pm

Log:
 r14847 at ketch:  falcone | 2006-11-30 18:03:45 -0500
 * we're always setting the timezone to the user's timezone, even if
   new is explicitly called with a timezone.  This breaks DateTime->from_epoch
   which wants data back in UTC


Modified: jifty/trunk/lib/Jifty/DateTime.pm
==============================================================================
--- jifty/trunk/lib/Jifty/DateTime.pm	(original)
+++ jifty/trunk/lib/Jifty/DateTime.pm	Thu Nov 30 18:04:09 2006
@@ -36,7 +36,7 @@
     # Unless the user has explicitly said they want a floating time,
     # we want to convert to the end-user's timezone.  This is
     # complicated by the fact that DateTime auto-appends
-    if (my $tz = $self->current_user_has_timezone) {
+    if (!$args{time_zone} and my $tz = $self->current_user_has_timezone) {
         $self->set_time_zone("UTC");
         $self->set_time_zone( $tz );
     }