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

diff --git a/defparams.pl b/defparams.pl
index 60a2d7726e47453e6275bec87fd35144312859f5..8534615ab468b5d4eae492317802e31535716d5b 100644 (file)
--- a/defparams.pl
+++ b/defparams.pl
@@ -770,8 +770,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 286b0c5429ece37dc38638c2b03ca4dbf74a4140..16be900ad851f43598299cd3b56f897db6c76e9b 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;
+
 my $dbh = Bugzilla->dbh;
 SendSQL("SELECT bug_id, short_desc, login_name " .
         "FROM bugs INNER JOIN profiles ON userid = assigned_to " .