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

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Fri Jan 11 21:22:29 2008
New Revision: 4826

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

Log:
 r50113 at onn:  sartak | 2008-01-11 21:21:54 -0500
 DateTime->new is pretty strict, so use DateTime->now
 Also accept user_object->timezone for intuiting the user's time zone.


Modified: jifty/trunk/lib/Jifty/DateTime.pm
==============================================================================
--- jifty/trunk/lib/Jifty/DateTime.pm	(original)
+++ jifty/trunk/lib/Jifty/DateTime.pm	Fri Jan 11 21:22:29 2008
@@ -157,7 +157,7 @@
     my $self = shift;
 
     # make this work as Jifty::DateTime->current_user_has_timezone
-    my $dt = ref($self) ? $self : $self->new;
+    my $dt = ref($self) ? $self : $self->now;
 
     $dt->_get_current_user();
 
@@ -168,7 +168,9 @@
     my $user_obj = $dt->current_user->user_object or return;
 
     # Check for a time_zone method and then use it if it exists
-    my $f = $dt->can('time_zone') or return;
+    my $f = $dt->can('time_zone') | $dt->can('timezone')
+        or return;
+
     return $f->($user_obj);
 }