From 720db163b9814b294b163347d994e513b8771ae7 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 8 Dec 2011 14:17:21 +0800
Subject: Bug 707931: fix broken backport

---
 template/en/default/bug/comments.html.tmpl |  3 +++
 template/en/default/bug/edit.html.tmpl     | 33 ------------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index a6a2867bb..ea0b774c0 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -47,6 +47,9 @@
         }
       [% END %]
 
+      /* Remove embedded links to attachment details */
+      replytext = replytext.replace(/(attachment\s+\d+)(\s+\[[^\[]+\])+/gi, '$1');
+
       /* <textarea id="comment"> */
       var textarea = document.getElementById('comment');
       textarea.value += replytext;
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index ae7ee8047..3a154b557 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -32,39 +32,6 @@
 
   <script type="text/javascript">
   <!--
-  /* Adds the reply text to the `comment' textarea */
-  function replyToComment(id, real_id, name) {
-      var prefix = "(In reply to ";
-      if (name) {
-          prefix = prefix + name + " from";
-      }
-      prefix = prefix + " comment #" + id + ")\n";
-      var replytext = "";
-      [% IF user.settings.quote_replies.value == 'quoted_reply' %]
-        /* pre id="comment_name_N" */
-        var text_elem = document.getElementById('comment_text_'+id);
-        var text = getText(text_elem);
-        replytext = prefix + wrapReplyText(text);
-      [% ELSIF user.settings.quote_replies.value == 'simple_reply' %]
-        replytext = prefix;
-      [% END %]
-
-      [% IF user.is_insider %]
-        if (document.getElementById('isprivate_' + real_id).checked) {
-            document.getElementById('newcommentprivacy').checked = 'checked';
-            updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment'); 
-        }
-      [% END %]
-    
-      /* Remove embedded links to attachment details */
-      replytext = replytext.replace(/(attachment\s+\d+)(\s+\[[^\[]+\])+/gi, '$1');
-
-      /* <textarea id="comment"> */
-      var textarea = document.getElementById('comment');
-      textarea.value += replytext;
-
-      textarea.focus();
-  }
 
 [% IF user.is_timetracker %]
   var fRemainingTime = [% bug.remaining_time %]; // holds the original value
-- 
cgit v1.2.3-24-g4f1b