tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
Ingo Schommer 2012-03-30 15:25:31 +02:00
parent f34e58f573
commit e6aa9ae017
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/thirdparty/history-js/scripts/uncompressed/history.html4.js vendored
View File

@ -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 <base> 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) ) {