From f6fc92ada2dbe866eaf8d64148e8a25b0d3d6a20 Mon Sep 17 00:00:00 2001
From: "johnath%mozilla.com"
 <johnath%mozilla.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 13 Dec 2007 15:03:43 +0000
Subject: [PATCH] Fix BrowserOnCommand() to use the correct content document
 for error pages in frames.  b=407369 r=gavin a=blocking-firefox3

git-svn-id: svn://10.0.0.236/trunk@240978 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index da4b5a1d2a2..fb8c1417792 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -2147,7 +2147,7 @@ function BrowserOnCommand(event) {
             case 2 : // Pre-fetch & pre-populate
               params.prefetchCert = true;
             case 1 : // Pre-populate
-              params.location = content.location.href;
+              params.location = errorDoc.location.href;
           }
         } catch (e) {
           Components.utils.reportError("Couldn't get ssl_override pref: " + e);
@@ -2158,7 +2158,7 @@ function BrowserOnCommand(event) {
         
         // If the user added the exception cert, attempt to reload the page
         if (params.exceptionAdded)
-          content.location.reload();
+          errorDoc.location.reload();
       }
       else if (ot == errorDoc.getElementById('getMeOutOfHereButton')) {
         // Redirect them to a known-functioning page, default start page