Bug 295213: whine mail still goes out even though whinedays = "0" - Patch by Marc...

diff --git a/defparams.pl b/defparams.pl
index 323b91edbb73aba54816af62a544990a3d3db72a..5f709c43ee3d402ea41607ce742e279052207f3b 100644 (file)
--- a/defparams.pl
+++ b/defparams.pl
@@ -570,8 +570,9 @@ Configure bugmail: %urlbase%userprefs.cgi?tab=email
 
   {
    name => 'whinedays',
-   desc => 'The number of days that we\'ll let a bug sit untouched in a NEW ' .
-           'state before our cronjob will whine at the owner.',
+   desc => q{The number of days that we'll let a bug sit untouched in a NEW
+             state before our cronjob will whine at the owner.<br>
+             Set to 0 to disable whining.},
    type => 't',
    default => 7
   },

diff --git a/whineatnews.pl b/whineatnews.pl
index c8bad23d77cb6dbeb39fdcbf2276bfed07e155ff..355f62cca30a5bceaca286c1d5ada05c7ac85783 100755 (executable)
--- a/whineatnews.pl
+++ b/whineatnews.pl
@@ -33,6 +33,9 @@ require "globals.pl";
 
 use Bugzilla::BugMail;
 
+# Whining is disabled if whinedays is zero
+exit unless Param('whinedays') >= 1;
+
 SendSQL("select bug_id,short_desc,login_name from bugs,profiles where " .
         "(bug_status = 'NEW' or bug_status = 'REOPENED') and " . 
         "to_days(now()) - to_days(delta_ts) > " . Param('whinedays') .