[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.18rc1-20-ga30cd04

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  a30cd04a70e3a1448ccdc49e32cd4b0dff242755 (commit)
       via  285297ae0a837a93f39c8612114040efdcf71b78 (commit)
       via  db3e18a3c44abc2dabd435c349b4a279b4a8f294 (commit)
       via  a562763b413fb4781cb4a674163fbe881945d033 (commit)
       via  2292483dc2750ba41bd49e1bed3cbc6de525ff80 (commit)
      from  7ea8cefb2b7707301b77256ed59a17661fdbbc45 (commit)

Summary of changes:
 lib/RT/Date.pm                         | 21 ++++++++++-----------
 share/html/Ticket/Elements/ShowSummary |  4 +++-
 2 files changed, 13 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit 2292483dc2750ba41bd49e1bed3cbc6de525ff80
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu May 19 13:56:09 2011 -0400

    Reorganize to reduce number of variables used

diff --git a/lib/RT/Date.pm b/lib/RT/Date.pm
index ceb1c21..de849c1 100644
--- a/lib/RT/Date.pm
+++ b/lib/RT/Date.pm
@@ -879,21 +879,20 @@ sub iCal {
         Date => 1, Time => 1,
         @_,
     );
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydaym,$isdst,$offset) =
-        $self->Localtime( 'utc' );
-
-    #the month needs incrementing, as gmtime returns 0-11
-    $mon++;
 
     my $res;
     if ( $args{'Date'} && !$args{'Time'} ) {
-        $res = sprintf( '%04d%02d%02d', $year, $mon, $mday );
-    }
-    elsif ( !$args{'Date'} && $args{'Time'} ) {
+        my (undef, undef, undef, $mday, $mon, $year) =
+            $self->Localtime( 'utc' );
+        $res = sprintf( '%04d%02d%02d', $year, $mon+1, $mday );
+    } elsif ( !$args{'Date'} && $args{'Time'} ) {
+        my ($sec, $min, $hour) =
+            $self->Localtime( 'utc' );
         $res = sprintf( 'T%02d%02d%02dZ', $hour, $min, $sec );
-    }
-    else {
-        $res = sprintf( '%04d%02d%02dT%02d%02d%02dZ', $year, $mon, $mday, $hour, $min, $sec );
+    } else {
+        my ($sec, $min, $hour, $mday, $mon, $year) =
+            $self->Localtime( 'utc' );
+        $res = sprintf( '%04d%02d%02dT%02d%02d%02dZ', $year, $mon+1, $mday, $hour, $min, $sec );
     }
     return $res;
 }

commit a562763b413fb4781cb4a674163fbe881945d033
Author: Darren Hemphill <darren at baselineit.co.za>
Date:   Thu May 19 13:58:32 2011 -0400

    When formatting days in iCal, do so in the user's timezone

diff --git a/lib/RT/Date.pm b/lib/RT/Date.pm
index de849c1..39feaa3 100644
--- a/lib/RT/Date.pm
+++ b/lib/RT/Date.pm
@@ -883,7 +883,7 @@ sub iCal {
     my $res;
     if ( $args{'Date'} && !$args{'Time'} ) {
         my (undef, undef, undef, $mday, $mon, $year) =
-            $self->Localtime( 'utc' );
+            $self->Localtime( 'user' );
         $res = sprintf( '%04d%02d%02d', $year, $mon+1, $mday );
     } elsif ( !$args{'Date'} && $args{'Time'} ) {
         my ($sec, $min, $hour) =

commit 285297ae0a837a93f39c8612114040efdcf71b78
Merge: 7ea8cef a562763
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Oct 11 19:20:07 2013 -0400

    Merge branch '4.0/ical-date-timezone' into 4.0-trunk


commit a30cd04a70e3a1448ccdc49e32cd4b0dff242755
Merge: 285297a db3e18a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Oct 11 19:59:18 2013 -0400

    Merge branch '4.0/link-people-box-for-watch-right' into 4.0-trunk


-----------------------------------------------------------------------