Changeset 311

Timestamp:

01/17/07 19:31:06 (2 years ago)

Author:

scorfield

Message:

Fixes #185 by not resetting circuit parent when looking for absolute circuit paths.

Location:

framework/trunk

Files:

• fuseboxApplication.cfc (modified) (2 diffs)
• myFusebox.cfc (modified) (1 diff)
• release.sh (modified) (1 diff)

framework/trunk/fuseboxApplication.cfc

@@ -60 +60 @@
                                         hint="I am FUSEBOX_CALLER_PATH." />
                 
-                <!--- ticket 184 enhanced <relocate> --->
+                <!--- ticket 185 fix parent --->
                 <cfset var myVersion = "5.0.9.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 
@@ -680 +680 @@
                         <cfelse>
                                 <cfset relative = true />
-                                <cfset parent = "" />
                         </cfif>
                         <cfif this.strictMode and nAttrs neq structCount(children[i].xmlAttributes)>

framework/trunk/myFusebox.cfc

@@ -16 +16 @@
 <cfcomponent hint="I provide the per-request myFusebox data structure and some convenience methods.">
         <cfscript>
-        // ticket 184 enhanced <relocate>
+        // ticket 185 fixed parent
         this.version.runtime     = "5.0.9.#REReplace('$LastChangedRevision$','[^0-9]','','all')#";
           

framework/trunk/release.sh

@@ -1 +1 @@
 #!/bin/sh
 cd /home/eclipse/workspace
-zip -r fusebox5/fusebox510B1.corefiles.cfmx.zip fusebox5/*.txt fusebox5/*.dtd fusebox5/*.cf[cm] fusebox5/verbs/*.cfm
+zip -r fusebox5/fusebox510B2.corefiles.cfmx.zip fusebox5/*.txt fusebox5/*.dtd fusebox5/*.cf[cm] fusebox5/verbs/*.cfm
 cd fusebox5
-zip -r fusebox510B1.skeleton.cfmx.zip skeleton/*.txt skeleton/*/*.txt skeleton/*.xml skeleton/*.cfm skeleton/*/*.cfm skeleton/*/*/*.cfm
+zip -r fusebox510B2.skeleton.cfmx.zip skeleton/*.txt skeleton/*/*.txt skeleton/*.xml skeleton/*.cfm skeleton/*/*.cfm skeleton/*/*/*.cfm