summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Attachment.pm5
-rw-r--r--Bugzilla/Config/Attachment.pm6
-rw-r--r--template/en/default/admin/params/attachment.html.tmpl7
-rw-r--r--template/en/default/global/user-error.html.tmpl2
4 files changed, 4 insertions, 16 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 3582ffb23..4aa74dcdf 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -474,9 +474,7 @@ sub _validate_filename {
sub _validate_data {
my ($throw_error, $hr_vars) = @_;
my $cgi = Bugzilla->cgi;
- my $maxsize = $cgi->param('ispatch') ? Bugzilla->params->{'maxpatchsize'}
- : Bugzilla->params->{'maxattachmentsize'};
- $maxsize *= 1024; # Convert from K
+
my $fh;
# Skip uploading into a local variable if the user wants to upload huge
# attachments into local files.
@@ -514,6 +512,7 @@ sub _validate_data {
}
# Make sure the attachment does not exceed the maximum permitted size
+ my $maxsize = Bugzilla->params->{'maxattachmentsize'} * 1024; # Convert from K
my $len = $data ? length($data) : 0;
if ($maxsize && $len > $maxsize) {
my $vars = { filesize => sprintf("%.0f", $len/1024) };
diff --git a/Bugzilla/Config/Attachment.pm b/Bugzilla/Config/Attachment.pm
index bbaaaa63d..72ad29a2d 100644
--- a/Bugzilla/Config/Attachment.pm
+++ b/Bugzilla/Config/Attachment.pm
@@ -50,12 +50,6 @@ sub get_param_list {
type => 'b',
default => 0
},
- {
- name => 'maxpatchsize',
- type => 't',
- default => '1000',
- checker => \&check_numeric
- },
{
name => 'maxattachmentsize',
diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index 132f971c0..ef3363bbb 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -31,12 +31,7 @@
"specify a URL when creating an attachment and " _
"treat the URL itself as if it were an attachment.",
- maxpatchsize => "The maximum size (in kilobytes) of patches. $terms.Bugzilla will not " _
- "accept patches greater than this number of kilobytes in size. " _
- "To accept patches of any size (subject to the limitations of " _
- "your server software), set this value to zero.",
-
- maxattachmentsize => "The maximum size (in kilobytes) of non-patch attachments. " _
+ maxattachmentsize => "The maximum size (in kilobytes) of attachments. " _
"$terms.Bugzilla will not accept attachments greater than this number " _
"of kilobytes in size. To accept attachments of any size " _
"(subject to the limitations of your server software), set this " _
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 0b10b7396..8969b9d30 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1258,7 +1258,7 @@
[% title = "File Too Large" %]
The file you are trying to attach is [% filesize FILTER html %]
kilobytes (KB) in size.
- Patches cannot be more than [% Param('maxpatchsize') %] KB in size.
+ Patches cannot be more than [% Param('maxattachmentsize') %] KB in size.
Try splitting your patch into several pieces.
[% ELSIF error == "product_access_denied" %]