From e6aa9ae017c57b4f223061254e4b1dcd1c84b778 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 30 Mar 2012 15:25:31 +0200 Subject: [PATCH] BUGFIX Fixed History.js library handling of relative URLs combined with a base URL (was causing infinite loops, e.g. /admin/#/admin/admin/admin/security) (#7002) --- .../history-js/scripts/uncompressed/history.html4.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/thirdparty/history-js/scripts/uncompressed/history.html4.js b/admin/thirdparty/history-js/scripts/uncompressed/history.html4.js index 6d8d4274a29..709d9b887ed 100644 --- a/admin/thirdparty/history-js/scripts/uncompressed/history.html4.js +++ b/admin/thirdparty/history-js/scripts/uncompressed/history.html4.js @@ -429,7 +429,10 @@ } // Create State - currentState = History.extractState(History.getFullUrl(currentHash||document.location.href,false),true); + // MODIFIED ischommer: URL normalization needs to respect our tag, + // otherwise will go into infinite loops + currentState = History.extractState(History.getFullUrl(currentHash||document.location.href,true),true); + // END MODIFIED // Check if we are the same state if ( History.isLastSavedState(currentState) ) {