From b6a27abd2fc3b3351fcf8743e0925d1beb4027c7 Mon Sep 17 00:00:00 2001
From: "akkana%netscape.com"
 <akkana%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 12 Sep 2002 19:35:55 +0000
Subject: [PATCH] 130337: Fix Get New Themes when
 browser.block.target_new_window is set. r=jfrancis sr=kin

git-svn-id: svn://10.0.0.236/trunk@129391 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDocShell.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index bf35b74a83d..60482fde842 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -4743,10 +4743,12 @@ nsDocShell::InternalLoad(nsIURI * aURI,
         //
         if (mDisallowPopupWindows) {
             PRBool bIsChromeOrResource = PR_FALSE;
-
-            aURI->SchemeIs("chrome", &bIsChromeOrResource);
+            mCurrentURI->SchemeIs("chrome", &bIsChromeOrResource);
             if (!bIsChromeOrResource) {
-                aURI->SchemeIs("resource", &bIsChromeOrResource);
+                aURI->SchemeIs("chrome", &bIsChromeOrResource);
+                if (!bIsChromeOrResource) {
+                    aURI->SchemeIs("resource", &bIsChromeOrResource);
+                }
             }
             if (!bIsChromeOrResource) {
                 if (name.EqualsIgnoreCase("_blank") ||