diff --git a/system/core/util/CFMLEngine.cfc b/system/core/util/CFMLEngine.cfc index 4aca6a975..5029af566 100644 --- 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 index 5139412c3..3c509dd21 100644 --- 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 index 61c27dd93..0ee154c5d 100644 --- a/test-harness/layouts/Main.cfm +++ b/test-harness/layouts/Main.cfm @@ -3,7 +3,7 @@
-