From 3c68667aedb34a763c4053a5586702292be58bb6 Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Wed, 3 Apr 2002 11:04:30 +0000 Subject: [PATCH] Prevent www. & .com fixup for link clicks and in frames & iframes. b=34943 r=radha@netscape.com sr=rpotts@netscape.com a=asa@mozilla.org a=jaimejr@netscape.com (adt) git-svn-id: svn://10.0.0.236/trunk@117997 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index ede21d5bff2..96a696364a4 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -801,6 +801,21 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress, doCreateAlternate = PR_FALSE; } } + // Skip fixup for anything except a normal document load operation + if (mLoadType != LOAD_NORMAL) + { + doCreateAlternate = PR_FALSE; + } + else + { + // Skip fixup for frames & iframes + nsCOMPtr targetParentTreeItem; + rv = GetSameTypeParent(getter_AddRefs(targetParentTreeItem)); + if (NS_SUCCEEDED(rv) && targetParentTreeItem) + { + doCreateAlternate = PR_FALSE; + } + } if (doCreateAlternate) { newURI = nsnull;