From c9ac4e5961736c3003c587a403c52f4ef892b0ca Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" Date: Tue, 26 Apr 2011 20:47:16 +0000 Subject: [PATCH] Bug 652748: When reloading a bug page, any comment ID (#nn) appended to the URL is lost r=dkl a=LpSolit git-svn-id: svn://10.0.0.236/trunk@262235 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- .../bugzilla/template/en/default/bug/show-header.html.tmpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 27cf9998741..6dde0214070 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -7789 \ No newline at end of file +7790 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/show-header.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/show-header.html.tmpl index 9619422efca..f424a80f330 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/show-header.html.tmpl +++ b/mozilla/webtools/bugzilla/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 %]" );