Bug 399074: Remove the 'maxpatchsize' parameter - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat

2 files changed, 2 insertions, 9 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',