From d160b2bddfa00e13723d11ecec325889b08ef64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sun, 27 Jul 2014 00:16:34 +0200
Subject: [PATCH] Backed out changeset 29b357a370f3

---
 browser/base/content/browser.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e4fd6bea530..74e0fbd4253 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2010,11 +2010,17 @@ function BrowserTryToCloseWindow()
 }
 
 function loadURI(uri, referrer, postData, allowThirdPartyFixup) {
+  if (postData === undefined)
+    postData = null;
+
+  var flags = nsIWebNavigation.LOAD_FLAGS_NONE;
+  if (allowThirdPartyFixup) {
+    flags |= nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
+    flags |= nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
+  }
+
   try {
-    openLinkIn(uri, "current",
-               { referrerURI: referrer,
-                 postData: postData,
-                 allowThirdPartyFixup: allowThirdPartyFixUp });
+    gBrowser.loadURIWithFlags(uri, flags, referrer, null, postData);
   } catch (e) {}
 }