Merge pull request #358 from MitrahSoft/CF8_Compat

Fixed some CF8 compatibility issues
atuttle · Nov 7, 2017 · 90b6c65 · 90b6c65
2 parents 6b7ce5e + fc5dc28
commit 90b6c65
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/core/api.cfc b/core/api.cfc
@@ -185,9 +185,9 @@
 		<cfargument name="targetPage" type="string" required="true" />
 
 		<cfset var _taffyRequest = {} />
-		<cfset request._taffyRequest = _taffyRequest />
 		<cfset var local = {} />
 		<cfset var m = '' />
+		<cfset request._taffyRequest = _taffyRequest />
 		<cfset local.debug = false />
 
 		<cfset _taffyRequest.metrics = {} />

diff --git a/core/factory.cfc b/core/factory.cfc
@@ -4,12 +4,19 @@
 		this.beans = structNew();
 		this.transients = structNew();
 		//functionality
-		function init(externalBeanFactory){
-			if (structKeyExists(arguments, "externalBeanFactory")) {
+	</cfscript>
+
+	<cffunction name="init" output="false">
+		<cfargument name="externalBeanFactory" default="">
+	<cfscript>
+			if (structKeyExists(arguments, "externalBeanFactory") AND arguments.externalBeanFactory neq "") {
 				this.externalBeanFactory = arguments.externalBeanFactory;
 			}
 			return this;
-		}
+	</cfscript>
+	</cffunction>
+
+	<cfscript>
 		// Proxy to beanExists to provide similar interface to ColdSpring
 		function containsBean(beanName){
 			return beanExists(arguments.beanName);