From 88726a41dc56b0848fb67aa632a21451bf46c9c5 Mon Sep 17 00:00:00 2001 From: avl Date: Wed, 3 Sep 2008 23:40:16 +0300 Subject: [PATCH] linksRow reference --- ipf/admin/model.php | 4 ++-- ipf/orm.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ipf/admin/model.php b/ipf/admin/model.php index d836c22..bac69e5 100644 --- 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 3b24720..90afb2f 100644 --- 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; } -- 2.49.0