Changeset 258

Timestamp:

11/03/06 22:30:34 (2 years ago)

Author:

scorfield

Message:

Fixes #153 by passing the application key directly into the exception handler.

Location:

framework/trunk

Files:

• fusebox5.cfm (modified) (2 diffs)
• fuseboxApplication.cfc (modified) (2 diffs)

framework/trunk/fusebox5.cfm

@@ -52 +52 @@
 
 <!--- FB5: allow "" default - FB41 required this variable: --->
-<cfparam name="variables.FUSEBOX_APPLICATION_PATH" type="string" default="" />
+<cfparam name="variables.FUSEBOX_APPLICATION_PATH" default="" />
 <!--- FB5: application key - FB41 always uses 'fusebox': --->
-<cfparam name="variables.FUSEBOX_APPLICATION_KEY" type="string" default="fusebox" />
-
-<cfparam name="variables.attributes" type="struct" default="#structNew()#" />
+<cfparam name="variables.FUSEBOX_APPLICATION_KEY" default="fusebox" />
+
+<cfparam name="variables.attributes" default="#structNew()#" />
 <cfset structAppend(attributes,URL,true) />
 <cfset structAppend(attributes,form,true) />
@@ -226 +226 @@
                 <cfset myFusebox.trace("Fusebox","Caught Fusebox exception '#cfcatch.type#'") />
         </cfif>
-        <cfif not isDefined("_fba.errortemplatesPath") or not _fba.handleFuseboxException(cfcatch,attributes,myFusebox)>
+        <cfif not isDefined("_fba.errortemplatesPath") or
+                        not _fba.handleFuseboxException(cfcatch,attributes,myFusebox,variables.FUSEBOX_APPLICATION_KEY)>
                 <cfrethrow /> 
         </cfif>

framework/trunk/fuseboxApplication.cfc

@@ -510 +510 @@
                 <cfargument name="myFusebox" type="any" required="true" 
                                         hint="I am the myFusebox object." />
+                <cfargument name="appKey" type="string" required="true" 
+                                        hint="I am the application key object." />
                 
                 <cfset var __handled = false />
@@ -516 +518 @@
                 <cfset var __errorFile = this.errortemplatesPath & __type & __ext />
                 <cfset var __handlerExists = fileExists(getApplicationRoot() & __errorFile) />
-                <cfset var FUSEBOX_APPLICATION_KEY = variables.appKey />
+                <cfset var FUSEBOX_APPLICATION_KEY = arguments.appKey />
                 
                 <cfloop condition="not __handlerExists and len(__type) gt 0">