Bug 1518967 - Edit attachment as comment does markdown, which is very unexpected

diff --git a/attachment.cgi b/attachment.cgi
index b165651e467dda3aa9f0f4a5d9effe13dd0c246a..df1b009fbb5f18166589f45575af2f572d516caa 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -619,10 +619,10 @@ sub insert {
   $bug->add_comment(
     $comment,
     {
-      isprivate  => $attachment->isprivate,
-      type       => CMT_ATTACHMENT_CREATED,
-      extra_data => $attachment->id,
-      is_markdown => Bugzilla->params->{use_markdown} ? 1 : 0
+      isprivate   => $attachment->isprivate,
+      type        => CMT_ATTACHMENT_CREATED,
+      extra_data  => $attachment->id,
+      is_markdown => Bugzilla->params->{use_markdown} ? 1 : 0,
     }
   );
 
@@ -775,14 +775,18 @@ sub update {
   # If the user submitted a comment while editing the attachment,
   # add the comment to the bug. Do this after having validated isprivate!
   my $comment = $cgi->param('comment');
+  my $is_markdown = Bugzilla->params->{use_markdown} ? 1 : 0;
+  if ($cgi->param('markdown_off')) {
+    $is_markdown = 0;
+  }
   if (defined $comment && trim($comment) ne '') {
     $bug->add_comment(
       $comment,
       {
-        isprivate  => $attachment->isprivate,
-        type       => CMT_ATTACHMENT_UPDATED,
-        extra_data => $attachment->id,
-        is_markdown => Bugzilla->params->{use_markdown} ? 1 : 0
+        isprivate   => $attachment->isprivate,
+        type        => CMT_ATTACHMENT_UPDATED,
+        extra_data  => $attachment->id,
+        is_markdown => $is_markdown,
       }
     );
   }

diff --git a/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl b/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl
index e28a142ae8273f28d6be1e66a023e955ca2f8bf2..52b369106af403f677743f40b711766f5c0645a8 100644 (file)
--- a/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl
@@ -21,6 +21,7 @@
 [% attachment_data = attachment.fetch_github_pr_diff %]
 
 <div>
+  <input type="hidden" name="markdown_off" value="1">
   [% INCLUDE global/textarea.html.tmpl
     id       = 'editFrame'
     name     = 'comment'

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 9bec3544207ec08534d49ac76a86a58cfc6f9e92..13f143eebe84afc7e378b195736e72ab7101c940 100644 (file)
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -179,6 +179,7 @@
           [% Hook.process('view') %]
           [% UNLESS custom_attachment_viewer %]
             <div>
+              <input type="hidden" name="markdown_off" value="1">
               [% INCLUDE global/textarea.html.tmpl
                 id      = 'editFrame'
                 name    = 'comment'