diff options
author | Andrey Andreev <narf@devilix.net> | 2017-11-15 13:37:24 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2017-11-15 13:37:24 +0100 |
commit | 432a9130059873551d1cff3e40d1d8432f552b96 (patch) | |
tree | aabda9878719055ea2ab6c375c29dacb792b5f2f /system/core | |
parent | 212df3650c30ce93219168d3305f374d8b8ece37 (diff) | |
parent | ee8324368f2844aae0d558f1d194419a2181c281 (diff) |
Merge branch '3.1-stable' into develop
Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281
Diffstat (limited to 'system/core')
-rw-r--r-- | system/core/Loader.php | 8 | ||||
-rw-r--r-- | system/core/Model.php | 12 |
2 files changed, 7 insertions, 13 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index fd43ebbe1..5b051e1a8 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -303,6 +303,8 @@ class CI_Loader { { throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model"); } + + log_message('info', 'CI_Model class loaded'); } elseif ( ! class_exists('CI_Model', FALSE)) { @@ -317,6 +319,8 @@ class CI_Loader { { throw new RuntimeException($app_path.$class.".php exists, but doesn't declare class ".$class); } + + log_message('info', config_item('subclass_prefix').'Model class loaded'); } } @@ -351,7 +355,9 @@ class CI_Loader { } $this->_ci_models[] = $name; - $CI->$name = new $model(); + $model = new $model(); + $CI->$name = $model; + log_message('info', 'Model "'.get_class($model).'" initialized'); return $this; } diff --git a/system/core/Model.php b/system/core/Model.php index c809e7b84..691053a9c 100644 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -49,18 +49,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class CI_Model { /** - * Class constructor - * - * @return void - */ - public function __construct() - { - log_message('info', 'Model Class Initialized'); - } - - // -------------------------------------------------------------------- - - /** * __get magic * * Allows models to access CI's loaded classes using the same |