From 79c727661144d556971c05cee81152d7a13bd59e Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 15 Aug 2014 15:17:39 +1200 Subject: [PATCH] BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url --- admin/javascript/LeftAndMain.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index c772076f6..2f6b529d3 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -374,7 +374,8 @@ jQuery.noConflict(); // Artificial HTTP referer, IE doesn't submit them via ajax. // Also rewrites anchors to their page counterparts, which is important // as automatic browser ajax response redirects seem to discard the hash/fragment. - formData.push({name: 'BackURL', value:History.getPageUrl()}); + // TODO Replaces trailing slashes added by History after locale (e.g. admin/?locale=en/) + formData.push({name: 'BackURL', value:History.getPageUrl().replace(/\/$/, '')}); // Save tab selections so we can restore them later this.saveTabState();