Second installment of Bug 179260 Unknown table 'map_assigned_to' in order clause at globals.pl line 242

r=bbaetz
a=justdave


git-svn-id: svn://10.0.0.236/trunk@133600 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugreport%peshkin.net
2002-11-12 00:43:34 +00:00
parent 87df0e7135
commit 89c311fab6

View File

@@ -528,12 +528,6 @@ if ($order) {
else {
ThrowCodeError("invalid_column_name_form");
}
} elsif (!grep($fragment =~ /^\Q$_\E(\s+(asc|desc))?$/, @selectnames)) {
# Add order columns to selectnames
# The fragment has already been validated
$fragment =~ s/\s+(asc|desc)$//;
trick_taint($fragment);
push @selectnames, $fragment;
}
}
# Now that we have checked that all columns in the order are valid,
@@ -560,6 +554,16 @@ if ($order) {
# DEFAULT
$order = "bugs.bug_status, bugs.priority, map_assigned_to.login_name, bugs.bug_id";
}
foreach my $fragment (split(/,/, $order)) {
$fragment = trim($fragment);
if (!grep($fragment =~ /^\Q$_\E(\s+(asc|desc))?$/, @selectnames)) {
# Add order columns to selectnames
# The fragment has already been validated
$fragment =~ s/\s+(asc|desc)$//;
$fragment =~ tr/a-zA-Z\.0-9\-_//cd;
push @selectnames, $fragment;
}
}
$db_order = $order; # Copy $order into $db_order for use with SQL query