const BASE_CLASSES_DIRECTORY

diff --git a/ipf/orm.php b/ipf/orm.php
index f728ac50eac16ca13304e22d87ae53848b1587d6..3b247205b49f862275cbcac59f73785868cd0eab 100644 (file)
--- a/ipf/orm.php
+++ b/ipf/orm.php
@@ -246,9 +246,9 @@ final class IPF_ORM {
         try{
             $it = new DirectoryIterator($directory.DIRECTORY_SEPARATOR.'_generated');
         }catch(RuntimeException $e){
-           return $loadedModels;
+            return $loadedModels;
         }
-       foreach ($it as $file) {
+        foreach ($it as $file) {
             $e = explode('.', $file->getFileName());
             if (end($e) === 'php') {
                $className = $e[0];

diff --git a/ipf/orm/import/builder.php b/ipf/orm/import/builder.php
index 2b996afdcd035ecf32ffe5b6a6306e9fc5a0f69f..542594e442a7464c8daa5110b72fea6d3d522984 100644 (file)
--- a/ipf/orm/import/builder.php
+++ b/ipf/orm/import/builder.php
@@ -10,7 +10,7 @@ class IPF_ORM_Import_Builder extends IPF_ORM_Builder
     protected $_generateBaseClasses = true;
     protected $_generateTableClasses = false;
     protected $_baseClassPrefix = 'Base';
-    protected $_baseClassesDirectory = '_generated';
+    protected $_baseClassesDirectory = IPF_ORM::BASE_CLASSES_DIRECTORY;
     protected $_baseClassName = 'IPF_ORM_Record';
     protected $_generateAccessors = false;
     protected static $_tpl;
@@ -79,7 +79,7 @@ class IPF_ORM_Import_Builder extends IPF_ORM_Builder
         return $this->_baseClassPrefix;
     }
 
-    public function setBaseClassesDirectory($baseClassesDirectory)
+    public function setbaseClassesDirectory($baseClassesDirectory)
     {
         $this->_baseClassesDirectory = $baseClassesDirectory;
     }

diff --git a/ipf/orm/import/schema.php b/ipf/orm/import/schema.php
index e44ac1c3a3df9da2bb0c35f356b52497b2caa3fb..10cdd65048bc594355dee1fdd2c106edaf2fd43a 100644 (file)
--- a/ipf/orm/import/schema.php
+++ b/ipf/orm/import/schema.php
@@ -12,7 +12,7 @@ class IPF_ORM_Import_Schema
                                 'generateTableClasses'  =>  false,
                                 'generateAccessors'     =>  false,
                                 'baseClassesPrefix'     =>  'Base',
-                                'baseClassesDirectory'  =>  '_generated',
+                                'baseClassesDirectory'  =>  IPF_ORM::BASE_CLASSES_DIRECTORY,
                                 'baseClassName'         =>  'IPF_ORM_Record');
 
     protected $_validation = array('root'       =>  array('abstract',