[Rt-commit] r18668 - in rt/3.999/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Wed Mar  4 18:08:24 2009
New Revision: 18668

Modified:
   rt/3.999/trunk/   (props changed)
   rt/3.999/trunk/lib/RT/DateTime.pm

Log:
 r80911 at onn:  sartak | 2009-03-04 18:08:17 -0500
 Make rfc2822 respect the time_zone argument, factor out the canonicalization of $self


Modified: rt/3.999/trunk/lib/RT/DateTime.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/DateTime.pm	(original)
+++ rt/3.999/trunk/lib/RT/DateTime.pm	Wed Mar  4 18:08:24 2009
@@ -57,12 +57,7 @@
     return $self->SUPER::set_time_zone($self->_canonicalize_time_zone($tz));
 }
 
-sub rfc2822 {
-    my $self = shift;
-    return $self->strftime('%a, %d %b %Y %H:%M:%S %z');
-}
-
-sub iso {
+sub _canonicalize_self {
     my $self = shift;
     my %args = (
         time_zone => undef,
@@ -73,12 +68,22 @@
     if ($args{time_zone}) {
         $clone = $self->clone;
         $clone->set_time_zone($args{time_zone});
+        return $clone;
     }
-    else {
-        $clone = $self;
-    }
 
-    return join ' ', $clone->ymd('-'), $clone->hms(':');
+    return $self;
+}
+
+sub rfc2822 {
+    my $self = _canonicalize_self(@_);
+
+    return $self->strftime('%a, %d %b %Y %H:%M:%S %z');
+}
+
+sub iso {
+    my $self = _canonicalize_self(@_);
+
+    return join ' ', $self->ymd('-'), $self->hms(':');
 }
 
 1;