bug 420425 correction, untangled patches.

This commit is contained in:
dveditz@cruzio.com 2008-03-19 16:40:56 -07:00
parent 24751a58e2
commit ab06027eb0

View File

@ -1092,8 +1092,8 @@ nsDocShell::ValidateOrigin(nsIDocShellTreeItem* aOriginTreeItem,
innerTargetURI = NS_GetInnermostURI(targetURI);
return innerOriginURI && innerTargetURI &&
NS_SUCCEEDED(originURI->SchemeIs("file", &originIsFile)) &&
NS_SUCCEEDED(targetURI->SchemeIs("file", &targetIsFile)) &&
NS_SUCCEEDED(innerOriginURI->SchemeIs("file", &originIsFile)) &&
NS_SUCCEEDED(innerTargetURI->SchemeIs("file", &targetIsFile)) &&
originIsFile && targetIsFile;
}