From 92f432b37aed7903d3610fa0c21e87d01aad1166 Mon Sep 17 00:00:00 2001
From: jomae <jomae@af82e41b-90c4-0310-8c96-b1721e28e2e2>
Date: Tue, 25 Jun 2024 12:08:40 +0000
Subject: [PATCH] 1.6.1dev: use `add_script` rather than directly adding
 `threaded_comments.js` in `ticket.html` template (closes #13760)

git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.6-stable@17834 af82e41b-90c4-0310-8c96-b1721e28e2e2
---
 trac/ticket/templates/ticket.html | 3 ---
 trac/ticket/web_ui.py             | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/trac/ticket/templates/ticket.html b/trac/ticket/templates/ticket.html
index db9d278d36..781bf775a6 100644
--- a/trac/ticket/templates/ticket.html
+++ b/trac/ticket/templates/ticket.html
@@ -29,9 +29,6 @@
 
     ${ super() }
 
-    # if ticket.exists:
-    <script src="${chrome.htdocs_location}js/threaded_comments.js"></script>
-    # endif
     <script>
       jQuery(function($) {
         $("div.description").find("h1,h2,h3,h4,h5,h6")
diff --git a/trac/ticket/web_ui.py b/trac/ticket/web_ui.py
index 79e152c872..fa32d643ca 100644
--- a/trac/ticket/web_ui.py
+++ b/trac/ticket/web_ui.py
@@ -757,6 +757,7 @@ def add_ticket_link(css_class, id):
                               'changes': data['changes'],
                               })
         add_stylesheet(req, 'common/css/ticket.css')
+        add_script(req, 'common/js/threaded_comments.js')
         chrome = Chrome(self.env)
         chrome.add_wiki_toolbars(req)
         if not data['disable_submit']: