[interchange-cvs] [SCM] Interchange branch, master, updated. 8f5ff11ebdb0840c29a50596354121179e71068e

[Peter Ajamian]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  8f5ff11ebdb0840c29a50596354121179e71068e (commit)
      from  4bc89c13f3bf0bb149c894ebc9ec19ac2a90af5e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8f5ff11ebdb0840c29a50596354121179e71068e
Author: Peter Ajamian <peter at pajamian.dhs.org>
Date:   Mon Jun 15 12:40:29 2009 -0700

    Fixed [convert-date] regression as reported by Marty Tennison.
    
    Fixed regression in [convert-date] that caused it to display Sunday for every
    day of the week if a raw date was passed and the adjust attribute was not.
    Thanks to Marty Tennison <marty at dripdepot.com> for reporting the bug.

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

Summary of changes and diff:
 WHATSNEW-5.7                  |    6 +++++-
 code/UserTag/convert_date.tag |    5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW-5.7 b/WHATSNEW-5.7
index 04024e5..a389a0a 100644
--- a/WHATSNEW-5.7
+++ b/WHATSNEW-5.7
@@ -146,9 +146,13 @@ UserTag
 * [convert-date] has a new compensate_dst attribute that when set to 1 will
   compensate the adjusted time for daylight savings time changes.
 
-* fixed bug in [convert-date] that skewed the time by one hour if the starting
+* Fixed bug in [convert-date] that skewed the time by one hour if the starting
   date was during daylight savings time and an adjustment was made.
 
+* Fixed regression in [convert-date] that caused it to display Sunday for every
+  day of the week if a raw date was passed and the adjust attribute was not.
+  Thanks to Marty Tennison <marty at dripdepot.com> for reporting the bug.
+
 SystemTag
 ---------
 
diff --git a/code/UserTag/convert_date.tag b/code/UserTag/convert_date.tag
index ba8fb78..e91b908 100644
--- a/code/UserTag/convert_date.tag
+++ b/code/UserTag/convert_date.tag
@@ -32,7 +32,6 @@ sub {
 		$t[5] = $1 - 1900;
 		$t[4] = $2 - 1;
 		$t[3] = $3;
-		$t[8] = -1;
 	} 
 	elsif($text =~ /\d/) {
 					$text =~ s/\D//g;
@@ -43,7 +42,6 @@ sub {
 					$t[4] = $2 - 1;
 					$t[5] = $1;
 					$t[5] -= 1900;
-					$t[8] = -1;
 	}
 	elsif (exists $opt->{empty}) {
 		return $opt->{empty};
@@ -54,6 +52,9 @@ sub {
 	}
 
 	if ($adjust) {
+		if ($#t < 8) {
+			$t[8] = -1;
+		}
 		$now ||= POSIX::mktime(@t);
 		$adjust .= ' days' if $adjust =~ /^[-\s\d]+$/;
 		@t = localtime(adjust_time($adjust, $now, $opt->{compensate_dst}));


hooks/post-receive
-- 
Interchange