From 03452defb84e7ce0bd09260028df9387bd243b83 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= Date: Thu, 2 Sep 2010 20:56:16 +0200 Subject: [PATCH] Bug 590144: The deadline is not kept in saved searches when set to 'Now' r=ghendricks a=LpSolit --- Bugzilla/Search.pm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index 05ec0934c2..7030bcbb0e 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -763,13 +763,9 @@ sub init { my $sql_deadlinefrom; my $sql_deadlineto; if ($user->is_timetracker) { - my $deadlinefrom; - my $deadlineto; - - if ($params->param('deadlinefrom')){ - $params->param('deadlinefrom', '') if lc($params->param('deadlinefrom')) eq 'now'; - $deadlinefrom = SqlifyDate($params->param('deadlinefrom')); - $sql_deadlinefrom = $dbh->quote($deadlinefrom); + if ($params->param('deadlinefrom')) { + my $deadlinefrom = $params->param('deadlinefrom'); + $sql_deadlinefrom = $dbh->quote(SqlifyDate($deadlinefrom)); trick_taint($sql_deadlinefrom); my $term = "bugs.deadline >= $sql_deadlinefrom"; push(@wherepart, $term); @@ -779,10 +775,9 @@ sub init { }); } - if ($params->param('deadlineto')){ - $params->param('deadlineto', '') if lc($params->param('deadlineto')) eq 'now'; - $deadlineto = SqlifyDate($params->param('deadlineto')); - $sql_deadlineto = $dbh->quote($deadlineto); + if ($params->param('deadlineto')) { + my $deadlineto = $params->param('deadlineto'); + $sql_deadlineto = $dbh->quote(SqlifyDate($deadlineto)); trick_taint($sql_deadlineto); my $term = "bugs.deadline <= $sql_deadlineto"; push(@wherepart, $term); @@ -1221,7 +1216,7 @@ sub _get_operator_field_override { sub SqlifyDate { my ($str) = @_; - $str = "" if !defined $str; + $str = "" if (!defined $str || lc($str) eq 'now'); if ($str eq "") { my ($sec, $min, $hour, $mday, $month, $year, $wday) = localtime(time()); return sprintf("%4d-%02d-%02d 00:00:00", $year+1900, $month+1, $mday); -- 2.47.2