diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-11-10 14:12:04 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-11-10 14:12:04 +0100 |
| commit | c9420849853a33a192c482e28c737e166d4fa698 (patch) | |
| tree | e6ddc086e31b13dfab68213ca50fa0d0dd309284 | |
| parent | 8c9e51044d991868228dba8b9d5141998347dbfe (diff) | |
Close #5330
| -rw-r--r-- | system/core/Loader.php | 8 | ||||
| -rw-r--r-- | system/core/Model.php | 12 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
3 files changed, 8 insertions, 13 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index fe2d43717..9813e99a9 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'); } } @@ -350,7 +354,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 diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 1641f7c97..1c35d9046 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -11,6 +11,7 @@ Release Date: Not Released - Updated :doc:`Form Validation Library <libraries/form_validation>` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. - Updated :doc:`Email Library <libraries/email>` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. + - Updated :doc:`Loader Library <libraries/loader>` method ``model()`` to log both ``CI_Model`` class loading and individual models' initialization. - Deprecated usage of :doc:`CAPTCHA Helper <helpers/captcha_helper>` function :php:func:`create_captcha()` with parameters other than ``$data``. Bug fixes for 3.1.7 |