fix conditionals for Boxlang detection which affect Testbox CFC execu…

…tion results
ColdBox · Jan 10, 2025 · bbd6dd6 · bbd6dd6
1 parent 5faa9cb
commit bbd6dd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/system/modules/HTMLHelper/models/HTMLHelper.cfc b/system/modules/HTMLHelper/models/HTMLHelper.cfc
@@ -2937,7 +2937,7 @@ component
 	private string function prepareBaseLink( boolean noBaseURL = false, src ){
 		var baseURL = replaceNoCase(
 			requestService.getContext().getSESbaseURL(),
-			findNoCase( ".cfm", cgi.script_name ) ? "index.cfm" : "index.bxm",
+			findNoCase( ".bx", cgi.script_name ) ? "index.bxm" : "index.cfm",
 			""
 		);
 		// return if base is eempty

diff --git a/system/web/routing/Router.cfc b/system/web/routing/Router.cfc
@@ -22,12 +22,12 @@ component
 	 ****************************************************************/
 
 	property
-		name    ="cachebox"  
+		name    ="cachebox"
 		inject  ="cachebox"
 		delegate="getCache";
 	property
 		name    ="controller"
-		inject  ="coldbox" 
+		inject  ="coldbox"
 		delegate="relocate,runEvent,runRoute";
 	property name="flash"  inject="coldbox:flash";
 	property name="logBox" inject="logbox";
@@ -194,7 +194,7 @@ component
 	 * This is ONLY called by the routing services and only ONCE in the Application Life-Cycle
 	 */
 	function startup(){
-		var frontController = findNoCase( ".cfm", cgi.script_name ) ? "index.cfm" : "index.bxm";
+		var frontController = findNoCase( ".bx", cgi.script_name ) ? "index.bxm" : "index.cfm";
 
 		// Verify baseUrl is still empty to default it for operation
 		if ( !len( variables.baseUrl ) ) {
@@ -2074,7 +2074,7 @@ component
 	 * Composes the base routing path with no host or protocol
 	 */
 	string function composeRoutingPath(){
-		var base = findNoCase( ".cfm", cgi.script_name ) ? "index.cfm" : "index.bxm";
+		var base = findNoCase( ".bx", cgi.script_name ) ? "index.bxm" : "index.cfm";
 		return variables.controller.getSetting( "RoutingAppMapping" ) & // routing app mapping
 		( variables.fullRewrites ? "" : base ); // full or controller routing
 	}