From d03e7e1bf1f9152bb7a8fa8a3ed70b570c8186b3 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Sun, 10 May 2015 15:24:36 +0200 Subject: [PATCH] Fixes on load_model --- src/Webmodel.php | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/src/Webmodel.php b/src/Webmodel.php index 3e6648a..0a2553c 100644 --- a/src/Webmodel.php +++ b/src/Webmodel.php @@ -76,6 +76,12 @@ class Webmodel { static public $prefix_db=''; + /** + * Array for check if a model was loaded. + */ + + static public $cache_model=array(); + /** * * With this property, you can define what is the server connection that you have to use for read the source data. @@ -254,17 +260,6 @@ class Webmodel { } - /** - * Method for load config from a project. - */ - - static public function load_config() - { - - //if(is_file($this->path_mo - - } - /** * Method for load models from a project. * @@ -290,32 +285,24 @@ class Webmodel { $path_model=Webmodel::$model_path.$app_model.'/'.Webmodel::$model_folder.'/models_'.$model.'.php'; - if(is_file($path_model)) + if(!isset(Webmodel::$cache_model[$app_model.'/'.$model])) { - - include($path_model); - - /*$func_load=$model.'ModelLoad'; - - if(!function_exists($func_load)) + + if(is_file($path_model)) { - throw new \Exception('Error: function '.$func_load.' not found in '.$path_model); + include($path_model); + + Webmodel::$cache_model[$app_model.'/'.$model]=1; } else { - return $func_load(); - - }*/ - - } - else - { - - throw new \Exception('Error: model not found in '.$path_model); - + throw new \Exception('Error: model not found in '.$path_model); + + } + } }