Bug 325361: When an event is scheduled at midnight of a given day of the month, one email is sent *each* hour of that day - Patch by Frédéric Buclin <LpSolit@gmail.com> r=wicked a=justdave

2 files changed, 6 insertions, 2 deletions

diff --git a/editwhines.cgi b/editwhines.cgi
index 49acb94ff..8086862d2 100755
--- a/editwhines.cgi
+++ b/editwhines.cgi
@@ -220,8 +220,8 @@ if ($cgi->param('update')) {
                 else {
                     my $o_day         = $cgi->param("orig_day_$sid") || '';
                     my $day           = $cgi->param("day_$sid") || '';
-                    my $o_time        = $cgi->param("orig_time_$sid") || '';
-                    my $time          = $cgi->param("time_$sid") || '';
+                    my $o_time        = $cgi->param("orig_time_$sid") || 0;
+                    my $time          = $cgi->param("time_$sid") || 0;
                     my $o_mailto      = $cgi->param("orig_mailto_$sid") || '';
                     my $mailto        = $cgi->param("mailto_$sid") || '';
                     my $o_mailto_type = $cgi->param("orig_mailto_type_$sid") || 0;
diff --git a/whine.pl b/whine.pl
index b001957dd..5a04502ac 100755
--- a/whine.pl
+++ b/whine.pl
@@ -564,6 +564,10 @@ sub reset_timer {
     $sth->execute($schedule_id);
     my ($run_day, $run_time) = $sth->fetchrow_array;
 
+    # It may happen that the run_time field is NULL or blank due to
+    # a bug in editwhines.cgi when this field was initially 0.
+    $run_time ||= 0;
+
     my $run_today = 0;
     my $minute_offset = 0;