Fix for bug # 166799. r= adamlock sr=alecf. Use LOAD_NORMAL_REPLACE for loads from onLoad Handler.

git-svn-id: svn://10.0.0.236/trunk@136711 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
radha%netscape.com 2003-01-21 04:10:56 +00:00
parent 8919eb3a40
commit 12c52bce2e

View File

@ -621,7 +621,7 @@ nsDocShell::LoadURI(nsIURI * aURI,
if (parentBusy & BUSY_FLAGS_BUSY) {
// The parent is still busy. We most likely got here
// through onLoadHandler.
loadType = LOAD_BYPASS_HISTORY;
loadType = LOAD_NORMAL_REPLACE;
shEntry = nsnull;
}
}
@ -654,7 +654,7 @@ nsDocShell::LoadURI(nsIURI * aURI,
if (((parentBusy & BUSY_FLAGS_BUSY) || (selfBusy & BUSY_FLAGS_BUSY)) && shEntry) {
// we don't want this additional load to get into history, since this
// load will automatially happen everytime, no matter how the page is loaded.
loadType = LOAD_BYPASS_HISTORY;
loadType = LOAD_NORMAL_REPLACE;
shEntry = nsnull;
}
}