From ec87e5310ad038abe4b2b329897638d866bf549a Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 14 Aug 2018 08:28:31 -0400
Subject: Revert "Bug 1456878 - Support markdown comments"

This reverts commit fd850e00db835d2b84c59014c3b1021fea2294fc.
---
 template/en/default/bug/comment.html.tmpl   |  7 +------
 template/en/default/bug/comments.html.tmpl  | 17 +++++------------
 template/en/default/bug/edit.html.tmpl      |  2 +-
 template/en/default/bug/link.html.tmpl      |  3 +--
 template/en/default/bug/new_bug.html.tmpl   |  2 +-
 template/en/default/email/bugmail.html.tmpl |  7 +------
 template/en/default/filterexceptions.pl     |  2 +-
 template/en/default/global/header.html.tmpl |  1 -
 template/en/default/pages/linked.html.tmpl  |  4 ++--
 9 files changed, 13 insertions(+), 32 deletions(-)

(limited to 'template')

diff --git a/template/en/default/bug/comment.html.tmpl b/template/en/default/bug/comment.html.tmpl
index 9b0deecc4..e3cd382fd 100644
--- a/template/en/default/bug/comment.html.tmpl
+++ b/template/en/default/bug/comment.html.tmpl
@@ -37,11 +37,6 @@
   <div id="comment_preview" class="bz_default_hidden bz_comment">
     <div id="comment_preview_loading" class="bz_default_hidden">Generating Preview...</div>
     <div id="comment_preview_error" class="bz_default_hidden"></div>
-    <div id="comment_preview_text" class="bz_comment_text"></div>
+    <pre id="comment_preview_text" class="bz_comment_text"></pre>
   </div>
 [% END %]
-
-<div id="comment-markdown-tip">
-  <img src="extensions/BMO/web/images/notice.png" width="16" height="16">
-  <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">Markdown styling now supported</a>
-</div>
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 98ab4645e..7af08efde 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -283,22 +283,15 @@
         </div>
       [% END %]
 
-
-[% IF comment.is_markdown %]
-  [% comment_tag = 'div' %]
-[% ELSE %]
-  [% comment_tag = 'pre' %]
-[% END %]
-
-[%# Don't indent incaase it's a <pre> block, since then the spaces are 
-  # displayed in the generated HTML
+[%# Don't indent the <pre> block, since then the spaces are displayed in the
+  # generated HTML
   #%]
-<[% comment_tag FILTER none %] class="bz_comment_text[% " collapsed" IF comment.collapsed %]"
+<pre class="bz_comment_text[% " collapsed" IF comment.collapsed %]"
   [% IF mode == "edit" || comment.collapsed %]
     id="comment_text_[% comment.count FILTER none %]"
   [% END %]>
-  [%- comment_text FILTER renderComment(bug, comment) -%]
-</[% comment_tag FILTER none %]>
+  [%- comment_text FILTER quoteUrls(bug, comment) -%]
+</pre>
     [% Hook.process('a_comment-end', 'bug/comments.html.tmpl') %]
     </div>
 [% END %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 69edfeb00..445e5fe0d 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -253,7 +253,7 @@
           (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>) 
         [% END %]
       [% END %]
-      <span role="heading" aria-level="1" id="short_desc_nonedit_display">[% bug.short_desc FILTER renderComment(bug, undef, 1) FILTER wbr %]</span>
+      <span role="heading" aria-level="1" id="short_desc_nonedit_display">[% bug.short_desc FILTER quoteUrls(bug) FILTER wbr %]</span>
       [% IF bug.check_can_change_field('short_desc', 0, 1) || 
             bug.check_can_change_field('alias', 0, 1)  %]
         <small class="editme">(<a href="#" id="editme_action">edit</a>)</small>
diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl
index 17b85589c..dc09848da 100644
--- a/template/en/default/bug/link.html.tmpl
+++ b/template/en/default/bug/link.html.tmpl
@@ -56,8 +56,7 @@
 
 <a class="bz_bug_link 
           bz_status_[% bug.bug_status FILTER css_class_quote %] 
-          [% ' bz_closed' IF !bug.isopened %]
-          [% ' bz_private_link' IF !user.can_see_bug(bug) %]"
+          [% ' bz_closed' IF !bug.isopened %]"
    title="[% link_title FILTER collapse FILTER html %]"
    href="[% urlbase FILTER html IF full_url %]show_bug.cgi?id=
          [%~ bug.id FILTER uri %][% anchor FILTER html %]">
diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl
index 185ae771b..ef5e361c0 100644
--- a/template/en/default/bug/new_bug.html.tmpl
+++ b/template/en/default/bug/new_bug.html.tmpl
@@ -244,7 +244,7 @@
     <textarea rows="5" name="comment" id="comment" aria-labelledby="comment-edit-tab"></textarea>
   </div>
   <div id="comment-preview-tabpanel" class="comment-tabpanel" role="tabpanel" aria-labelledby="comment-preview-tab" style="display:none">
-    <div id="comment-preview" class="comment-text"></div>
+    <pre id="comment-preview" class="comment-text"></pre>
   </div>
 </div>
 [% END %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index cdcb3d13d..8b567b691 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -38,12 +38,7 @@
               on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
               from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
           [% END %]
-        [% IF comment.is_markdown %]
-          [% comment_tag = 'div' %]
-        [% ELSE %]
-          [% comment_tag = 'pre' %]
-        [% END %]
-        <[% comment_tag FILTER none %]>[% comment.body_full({ wrap => 1 }) FILTER renderComment(bug, comment) %]</[% comment_tag FILTER none %]>
+        <pre>[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment, to_user) %]</pre>
         </div>
       [% END %]
       </p>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 07211ad29..39f064035 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -34,7 +34,7 @@
 #                                   [% foo.push() %]
 # TT loop variables               - [% loop.count %]
 # Already-filtered stuff          - [% wibble FILTER html %]
-#   where the filter is one of html|csv|js|renderComment|time|uri|xml|none
+#   where the filter is one of html|csv|js|quoteUrls|time|uri|xml|none
 
 %::safe = (
 
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 426742495..bd9ec8bcb 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -112,7 +112,6 @@
             },
             constant => {
                 COMMENT_COLS => constants.COMMENT_COLS,
-                URL_BASE => urlbase,
             },
             string => {
                 # Please keep these in alphabetical order.
diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl
index aa519f9ac..b5d850627 100644
--- a/template/en/default/pages/linked.html.tmpl
+++ b/template/en/default/pages/linked.html.tmpl
@@ -31,7 +31,7 @@
 
 <p>
 <pre class="bz_comment_text">
-[%- cgi.param("text") FILTER renderComment FILTER html -%]
+[%- cgi.param("text") FILTER quoteUrls FILTER html -%]
 </pre>
 </p>
 
@@ -46,7 +46,7 @@
 
 <p>
 <pre class="bz_comment_text">
-[%- cgi.param("text") FILTER renderComment -%]
+[%- cgi.param("text") FILTER quoteUrls -%]
 </pre>
 </p>
 
-- 
cgit v1.2.3-24-g4f1b