linksRow reference

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index d836c222f1fc7c7478bac31361d07d32498d1e31..bac69e584c5818011a57c3d81284125585ddd4f8 100644 (file)
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -110,11 +110,11 @@ class IPF_Admin_Model{
             }
             $row[$h['name']] = $str;
         }
-        $this->LinksRow($row, $o);
+        $this->linksRow(&$row, $o);
         return $row;
     }
     
-    protected function LinksRow($row, $o){
+    protected function linksRow(&$row, $o){
         if (method_exists($this,'list_display_links')){
             $links_display = $this->list_display_links();
         }else{

diff --git a/ipf/orm.php b/ipf/orm.php
index 3b247205b49f862275cbcac59f73785868cd0eab..90afb2f0afab384f6322ddfc597012b8ed9cc27a 100644 (file)
--- a/ipf/orm.php
+++ b/ipf/orm.php
@@ -189,6 +189,8 @@ final class IPF_ORM {
     const IDENTIFIER_COMPOSITE      = 4;
     const MODEL_LOADING_AGGRESSIVE   = 1;
     const MODEL_LOADING_CONSERVATIVE= 2;
+    
+    const BASE_CLASSES_DIRECTORY    = '_generated';
 
     private static $_loadedModelFiles = array();
 
@@ -244,7 +246,7 @@ final class IPF_ORM {
     {
         $loadedModels = array();
         try{
-            $it = new DirectoryIterator($directory.DIRECTORY_SEPARATOR.'_generated');
+            $it = new DirectoryIterator($directory.DIRECTORY_SEPARATOR.IPF_ORM::BASE_CLASSES_DIRECTORY);
         }catch(RuntimeException $e){
             return $loadedModels;
         }