Browse files

BUGFIX Fixed History.js library handling of relative URLs combined wi…

…th a base URL (was causing infinite loops, e.g. /admin/#/admin/admin/admin/security) (#7002)
  • Loading branch information...
1 parent f34e58f commit e6aa9ae017c57b4f223061254e4b1dcd1c84b778 @chillu chillu committed Mar 30, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 admin/thirdparty/history-js/scripts/uncompressed/history.html4.js
View
5 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 <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) ) {

0 comments on commit e6aa9ae

Please sign in to comment.