From 245bc528b80a8305ef5096a723172ae4d2142b5a Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Thu, 8 Jan 2004 04:18:08 +0000 Subject: [PATCH] History loads should never lead to creation of new session history entries. Bug 227672, r=adamlock, sr=darin git-svn-id: svn://10.0.0.236/trunk@151015 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 7c23e054f0f..bdc7d1c4dfa 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -5901,9 +5901,8 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, // Determine if this type of load should update history. if (aLoadType == LOAD_BYPASS_HISTORY || - aLoadType & LOAD_CMD_HISTORY || - aLoadType == LOAD_RELOAD_NORMAL || - aLoadType == LOAD_RELOAD_CHARSET_CHANGE) + aLoadType & LOAD_CMD_HISTORY || + aLoadType & LOAD_CMD_RELOAD) updateHistory = PR_FALSE; // Check if the url to be loaded is the same as the one already loaded.