Changeset 253 for framework/trunk/verbs/include.cfm

Timestamp:

11/03/06 20:02:31 (2 years ago)

Author:

scorfield

Message:

Fixes #162 by testing template name and reverting to FB4.1 behavior if it contains #..#
i.e., it is dynamically evaluated. Added a test case for it.

Files:

• framework/trunk/verbs/include.cfm (modified) (2 diffs)

framework/trunk/verbs/include.cfm

@@ -142 +142 @@
                         fb_.template = fb_.verbInfo.attributes.template;
                 }
+                if (find('##',fb_.template) gt 0) {
+                        fb_.templateLen = 'len("#fb_.template#")';
+                } else {
+                        fb_.templateLen = len(fb_.template);
+                }
                 
                 if (fb_.app.debug) {
@@ -175 +180 @@
                         fb_appendLine('<cfoutput><cfinclude template="#fb_.verbInfo.action.getCircuit().getApplication().parseRootPath##fb_.targetCircuit.getRelativePath()##fb_.template#"></cfoutput>');
                 }
-                fb_appendLine('<cfcatch type="missingInclude"><cfif len(cfcatch.MissingFileName) gte #len(fb_.template)# and right(cfcatch.MissingFileName,#len(fb_.template)#) is "#fb_.template#">');
+                fb_appendLine('<cfcatch type="missingInclude"><cfif len(cfcatch.MissingFileName) gte #fb_.templateLen# and right(cfcatch.MissingFileName,#fb_.templateLen#) is "#fb_.template#">');
                 if (fb_.verbInfo.attributes.required) {
                         fb_appendLine('<cfthrow type="fusebox.missingFuse" message="missing Fuse" ' &