aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2020-01-27 13:12:36 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2020-01-27 13:13:19 -0800
commitc1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c (patch)
tree8bd404f3de72b7275d531997a130a971db52f8e8 /attachment.cgi
parentMerge commit '7f3a749d7bd78a3e4aee163f562d7e95b0954b44' into bugstest (diff)
parentbump version and add release notes for 5.0.6 (diff)
downloadbugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.tar.gz
bugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.tar.bz2
bugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.zip
Merge tag 'release-5.0.6' into bugstest
Merge upstream 5.0.6 release, now without conflicts after the problematic code reformatting change. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'attachment.cgi')
-rwxr-xr-xattachment.cgi4
1 files changed, 2 insertions, 2 deletions
diff --git a/attachment.cgi b/attachment.cgi
index e437fe8e5..0d87c7fcd 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -205,7 +205,7 @@ sub get_attachment {
}
$attachments{$field_name} = $attachment;
}
- my @args = map { $_ . '=' . $attachments{$_}->id } @field_names;
+ my @args = map { $_ . '=' . $attachments{$_}->id } @field_names;
my $cgi_params = $cgi->canonicalise_query(@field_names, 't', 'Bugzilla_login',
'Bugzilla_password');
push(@args, $cgi_params) if $cgi_params;
@@ -804,7 +804,7 @@ sub delete_attachment {
# The token is valid. Delete the content of the attachment.
my $msg;
$vars->{'attachment'} = $attachment;
- $vars->{'reason'} = clean_text($cgi->param('reason') || '');
+ $vars->{'reason'} = clean_text($cgi->param('reason') || '');
$template->process("attachment/delete_reason.txt.tmpl", $vars, \$msg)
|| ThrowTemplateError($template->error());