Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 58613 "last page visited" cannot handle framed pages properly

Browse Source 
patch by ian@arlen.demon.co.uk r=timeless sr=alecf


git-svn-id: svn://10.0.0.236/trunk@144042 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2003-06-22 17:46:13 +00:00
parent c76137a92c
commit 00d6fdabfc
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -6542,6 +6542,26 @@ nsDocShell::AddToGlobalHistory(nsIURI * aURI, PRBool aHidden)
NS_ENSURE_SUCCESS(mGlobalHistory->AddPage(spec.get()), NS_ERROR_FAILURE);
// Only save last page visited if it is not a frame and one of the
// startup, new window or new tab prefs is set to last page visited.
// See bug 58613 for more details.
if (mPrefs && !IsFrame()) {
PRInt32 choice = 0;
if (NS_SUCCEEDED(mPrefs->GetIntPref("browser.startup.page", &choice))) {
if (choice != 2) {
if (NS_SUCCEEDED(mPrefs->GetIntPref("browser.windows.loadOnNewWindow", &choice))) {
if (choice != 2)
mPrefs->GetIntPref("browser.tabs.loadOnNewTab", &choice);
}
}
}
if (choice == 2) {
browserHistory = do_QueryInterface(mGlobalHistory);
if (browserHistory)
browserHistory->SetLastPageVisited(spec.get());
}
}
// this is a redirect, hide the page from
// being enumerated in history
if (aHidden && browserHistory) {