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
This commit is contained in:
@@ -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<nsIDocShellTreeItem> targetParentTreeItem;
|
||||
rv = GetSameTypeParent(getter_AddRefs(targetParentTreeItem));
|
||||
if (NS_SUCCEEDED(rv) && targetParentTreeItem)
|
||||
{
|
||||
doCreateAlternate = PR_FALSE;
|
||||
}
|
||||
}
|
||||
if (doCreateAlternate)
|
||||
{
|
||||
newURI = nsnull;
|
||||
|
||||
Reference in New Issue
Block a user