bug 755116 - Add a way to disable global history on a docshell (while leaving session history active). r=gavin

2012-05-25 16:08:48 +10:00
parent 0aa4b1a0aa
commit adc1f8e273
1 changed files with 2 additions and 2 deletions
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -710,8 +710,8 @@
              this.webNavigation.sessionHistory =
                      Components.classes["@mozilla.org/browser/shistory;1"]
                                .createInstance(Components.interfaces.nsISHistory);
-              // enable global history
-              if (this.docShell)
+              // enable global history if we weren't told otherwise
+              if (this.docShell && !this.hasAttribute("disableglobalhistory"))
                this.docShell.QueryInterface(Components.interfaces.nsIDocShellHistory).useGlobalHistory = true;
            }
          }