Changeset 1735

Timestamp:

08/28/08 13:01:32 (4 months ago)

Author:

lmajano

Message:

#558
definition file validation algorithm reversed to do local first, expand second and absolute last.

Files:

• coldbox/trunk/system/plugins/ioc.cfc (modified) (2 diffs)

coldbox/trunk/system/plugins/ioc.cfc

@@ -229 +229 @@
-                        }               
-                        
-                        /* Absolute Path Check */
-                        if( fileExists(getIOCDefinitionFile()) ){
-                                setExpandedIOCDefinitionFile( getIOCDefinitionFile() );
-                        }
-                        /* Relative App Path Check */
-else 
+
-                                setExpandedIOCDefinitionFile( appRoot & getIOCDefinitionFile() );
-                        }
@@ -240 +236 @@
-                        else if( fileExists( expandPath(getIOCDefinitionFile()) ) ){
-                                setExpandedIOCDefinitionFile( ExpandPath(getIOCDefinitionFile()) );
+                        }
+                        /* Absolute Path Check */
+                        else if( fileExists(getIOCDefinitionFile()) ){
+                                setExpandedIOCDefinitionFile( getIOCDefinitionFile() );
-                        }
-                        else{