Merge branch '1' into 2

silverstripe · Aug 22, 2022 · 809ca2d · 809ca2d
2 parents 89b399a + 55440b0
commit 809ca2d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/LeftAndMain.js b/client/src/legacy/LeftAndMain.js
@@ -618,7 +618,7 @@ $.entwine('ss', function($) {
       .fail((xhr, status, error) => {
         // Ignoring aborts: The server request failed, so prevent a mixed UI state by rolling back to previously
         // succesfully loaded URL (consistent with currently loaded content).
-        if (xhr.readyState !== 0) {
+        if (xhr.readyState !== 0 && xhr.getResponseHeader('X-Reauthenticate') !== '1') {
           this.reverseStateChange();
         }
       })

diff --git a/yarn.lock b/yarn.lock
@@ -3077,7 +3077,7 @@ colormin@^1.0.5:
 [email protected], colors@^1.1.2, colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
+  integrity sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==
 
 columnify@~1.5.4:
   version "1.5.4"