Bug 584110: Don't name attachment files "attachment.txt" by default, because this...

a=LpSolit

diff --git a/attachment.cgi b/attachment.cgi
index 8e69d388fd2e0033707b89e54a7ac2413ddc50e5..8117131b37a5943a668c48073e993d86c633f54f 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -481,7 +481,7 @@ sub insert {
          creation_ts   => $timestamp,
          data          => scalar $cgi->param('attach_text') || $cgi->upload('data'),
          description   => scalar $cgi->param('description'),
-         filename      => $cgi->param('attach_text') ? 'attachment.txt' : scalar $cgi->upload('data'),
+         filename      => $cgi->param('attach_text') ? "file_$bugid.txt" : scalar $cgi->upload('data'),
          ispatch       => scalar $cgi->param('ispatch'),
          isprivate     => scalar $cgi->param('isprivate'),
          mimetype      => $content_type,

diff --git a/post_bug.cgi b/post_bug.cgi
index 74d26af2b6d4109f16d991a8750989e2d145e328..2c8062605f3b6eda3198c775b595de0c431926bc 100755 (executable)
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -200,7 +200,7 @@ if (defined($cgi->upload('data')) || $cgi->param('attach_text')) {
              creation_ts   => $timestamp,
              data          => scalar $cgi->param('attach_text') || $cgi->upload('data'),
              description   => scalar $cgi->param('description'),
-             filename      => $cgi->param('attach_text') ? 'attachment.txt' : scalar $cgi->upload('data'),
+             filename      => $cgi->param('attach_text') ? "file_$id.txt" : scalar $cgi->upload('data'),
              ispatch       => scalar $cgi->param('ispatch'),
              isprivate     => scalar $cgi->param('isprivate'),
              mimetype      => $content_type,