From 69fb8e0918f21fcc3f79955fa6f38418e1fd1f0a Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sat, 13 Sep 2014 17:47:38 +1000
Subject: [PATCH] Fixes issue where load indicator hangs around on errors when
 a redirect is used

---
 modules/system/assets/js/framework.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index 06c7e71e4..1829dc49e 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -103,14 +103,18 @@ if (window.jQuery === undefined)
                 if (isUnloading)
                     return
 
+                /*
+                 * Disable redirects
+                 */
+                isRedirect = false
+                options.redirect = null
+
                 /*
                  * Error 406 is a "smart error" that returns response object that is
                  * processed in the same fashion as a successful response.
                  */
                 if (jqXHR.status == 406 && jqXHR.responseJSON) {
                     errorMsg = jqXHR.responseJSON['X_OCTOBER_ERROR_MESSAGE']
-                    isRedirect = false
-                    options.redirect = null
                     updatePromise = requestOptions.handleUpdateResponse(jqXHR.responseJSON, textStatus, jqXHR)
                 }
                 /*