1.7.1dev: merge [17834] from 1.6-stable (fix for #13760)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17835 af82e41b-90c4-0310-8c96-b1721e28e2e2
edgewall · Jun 25, 2024 · e011e2d · e011e2d
2 parents 5d74101 + 92f432b
commit e011e2d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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']: