From 9ecf79e385732441224a358b846133b98ba5bce9 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 23 Sep 2015 17:55:16 +0200
Subject: [PATCH] Fix infinite redirect on some nojs pages.

---
 framework/core/views/app.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/core/views/app.blade.php b/framework/core/views/app.blade.php
index 0f566a9c0..fe29e42d0 100644
--- a/framework/core/views/app.blade.php
+++ b/framework/core/views/app.blade.php
@@ -41,7 +41,8 @@
             app.boot();
           @if (! $forum->attributes->debug)
           } catch (e) {
-            window.location = window.location + '?nojs=1';
+            var nojs = window.location.indexOf('?') === -1 ? '?nojs=1' : ':nojs=1';
+            window.location = window.location + nojs;
           }
           @endif
         </script>