Commit dc850794 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com

Fixing bug 418068 for real. The previous patch was broken. Patch by Jesse Clark…

Fixing bug 418068 for real. The previous patch was broken. Patch by Jesse Clark <jjclark1982@gmail.com> r=mkanat
parent 8536f7e3
...@@ -1226,15 +1226,15 @@ sub _long_desc_changedbefore_after { ...@@ -1226,15 +1226,15 @@ sub _long_desc_changedbefore_after {
my $self = shift; my $self = shift;
my %func_args = @_; my %func_args = @_;
my ($chartid, $t, $v, $supptables, $term) = my ($chartid, $t, $v, $supptables, $term) =
@func_args{qw(chartid v supptables term)}; @func_args{qw(chartid t v supptables term)};
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
my $operator = ($$t =~ /before/) ? '<' : '>'; my $operator = ($$t =~ /before/) ? '<' : '>';
my $table = "longdescs_$$chartid"; my $table = "longdescs_$$chartid";
push(@$supptables, "LEFT JOIN longdescs AS $table " . push(@$supptables, "LEFT JOIN longdescs AS $table " .
"ON $table.bug_id = bugs.bug_id " . "ON $table.bug_id = bugs.bug_id " .
"AND $table.bug_when $operator " . "AND $table.bug_when $operator " .
$dbh->quote(SqlifyDate($$v)) ); $dbh->quote(SqlifyDate($$v)) );
$$term = "($table.bug_when IS NOT NULL)"; $$term = "($table.bug_when IS NOT NULL)";
} }
...@@ -1423,16 +1423,16 @@ sub _work_time_changedbefore_after { ...@@ -1423,16 +1423,16 @@ sub _work_time_changedbefore_after {
my $self = shift; my $self = shift;
my %func_args = @_; my %func_args = @_;
my ($chartid, $t, $v, $supptables, $term) = my ($chartid, $t, $v, $supptables, $term) =
@func_args{qw(chartid v supptables term)}; @func_args{qw(chartid t v supptables term)};
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
my $operator = ($$t =~ /before/) ? '<' : '>'; my $operator = ($$t =~ /before/) ? '<' : '>';
my $table = "longdescs_$$chartid"; my $table = "longdescs_$$chartid";
push(@$supptables, "LEFT JOIN longdescs AS $table " . push(@$supptables, "LEFT JOIN longdescs AS $table " .
"ON $table.bug_id = bugs.bug_id " . "ON $table.bug_id = bugs.bug_id " .
"AND $table.work_time <> 0" . "AND $table.work_time <> 0" .
"AND $table.bug_when $operator " . "AND $table.bug_when $operator " .
$dbh->quote(SqlifyDate($$v)) ); $dbh->quote(SqlifyDate($$v)) );
$$term = "($table.bug_when IS NOT NULL)"; $$term = "($table.bug_when IS NOT NULL)";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment