more boxlang compat

ColdBox · Oct 24, 2024 · 6eba7fd · 6eba7fd
1 parent f6c3043
commit 6eba7fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/system/core/util/CFMLEngine.cfc b/system/core/util/CFMLEngine.cfc
@@ -59,7 +59,7 @@ component {
 	 * Verify if this is a lucee server
 	 */
 	boolean function isLucee(){
-		return structKeyExists( server, "lucee" );
+		return server.keyExists( "lucee" ) && !server.keyExists( "boxlang" );
 	}
 
 	/**

diff --git a/test-harness/Application.cfc b/test-harness/Application.cfc
@@ -87,7 +87,7 @@ component {
 			}
 		}
 
-		if( url.keyExists( "fwreinit" ) ){
+		if( url.keyExists( "fwreinit" ) && getFunctionList().keyExists( "ormReload" ) ){
 			ormReload();
 		}
 

diff --git a/test-harness/layouts/Main.cfm b/test-harness/layouts/Main.cfm
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title>#server.keyExists( "lucee" ) ? "lucee" : "adobe"# #server.coldfusion.productVersion# - Welcome to Coldbox!</title>
+	<title>#controller.getCFMLEngine().getEngine()# #controller.getCFMLEngine().getFullVersion()# - Welcome to Coldbox!</title>
 	<meta name="description" content="ColdBox Application Template">
     <meta name="author" content="Ortus Solutions, Corp">
 	<!---Base URL --->