Fix for bug #162128. Find a usable base uri for urls loaded through javascript.

r=jst sr=darin. git-svn-id: svn://10.0.0.236/trunk@138981 18797224-902f-48f8-a5cc-f745e15eee43
2003-03-05 22:23:47 +00:00
parent c03e47d2be
commit 3e60babb83
3 changed files with 69 additions and 5 deletions
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -6119,7 +6119,8 @@ nsDocShell::AddToSessionHistory(nsIURI * aURI,
    }
    else {  
        // This is a subframe.
-        if (mLoadType != LOAD_NORMAL_REPLACE)
+        if ((mLoadType != LOAD_NORMAL_REPLACE) ||
+            (mLoadType == LOAD_NORMAL_REPLACE && !mOSHE))
            rv = AddChildSHEntry(nsnull, entry, mChildOffset);
    }