Bug 652748: When reloading a bug page, any comment ID (#nn) appended to the URL is lost

template/en/default/bug/show-header.html.tmpl

@@ -32,14 +32,14 @@
 [% subheader = filtered_desc %]
 [% filtered_timestamp = bug.delta_ts FILTER time %]
 [% title = "$terms.Bug $bug.bug_id – $filtered_desc" %]
-[% unfiltered_title = "$terms.Bug $bug.bug_id – $bug.short_desc" %]
 [% header = "$terms.Bug $bug.bug_id" %]
 [% header_addl_info = "Last modified: $filtered_timestamp" %]
 [% yui = ['autocomplete', 'calendar'] %]
 [% javascript_urls = [ "js/util.js", "js/field.js" ] %]
-[% IF ! Bugzilla.cgi.url.match("show_bug.cgi") && bug.defined %]
+[% IF bug.defined %]
+  [% unfiltered_title = "$terms.Bug $bug.bug_id – $bug.short_desc" %]
   [% javascript =  BLOCK %]
-    if( history && history.replaceState ) {
+    if( !document.location.href.match(/show_bug\.cgi/) && history && history.replaceState ) {
       history.replaceState( null, 
                          "[% unfiltered_title FILTER js %]",  
                          "show_bug.cgi?id=[% bug.bug_id FILTER js %]" );