From 3beab611a346a155a5efd0ab565e38ce634fe36f Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Wed, 18 Apr 2018 21:40:29 +0200
Subject: [PATCH] Rev3415, Fix FireFox wrapper_nonce url injection

---
 src/Config.py                | 2 +-
 src/Ui/template/wrapper.html | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Config.py b/src/Config.py
index 1d35bc60..deaa2c9f 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.6.2"
-        self.rev = 3412
+        self.rev = 3415
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"
diff --git a/src/Ui/template/wrapper.html b/src/Ui/template/wrapper.html
index 61efbd26..e6e6a1fb 100644
--- a/src/Ui/template/wrapper.html
+++ b/src/Ui/template/wrapper.html
@@ -17,7 +17,7 @@
 <script>
 // If we are inside iframe escape from it
 if (window.self !== window.top) {
-	window.open(window.location.toString(), "_top");
+	window.open(window.location.toString().replace(/([&?])wrapper=False/, "$1").replace(/&$/, "").replace(/[&?]wrapper_nonce=[A-Za-z0-9]+/, ""), "_top");
 	document.write("Escaping from iframe...");
 	window.stop();
 	document.execCommand("Stop", false);
@@ -64,7 +64,6 @@ else if (window.opener && window.opener.location.toString()) {
 
 <!-- Site info -->
 <script id="script_init">
-document.getElementById("inner-iframe").src = "about:blank"
 document.getElementById("inner-iframe").src = "{file_url}{query_string}"
 address = "{address}"
 wrapper_nonce = "{wrapper_nonce}"