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)
silverstripe · Mar 30, 2012 · e6aa9ae · e6aa9ae
1 parent f34e58f
commit e6aa9ae
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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 <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) ) {