diff options
| author | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-31 15:44:02 +0100 |
|---|---|---|
| committer | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-31 15:44:02 +0100 |
| commit | 3ccc386be4e0e1e4b3d47f1785e11d4b8613ef72 (patch) | |
| tree | f1c8cd29775537b8da76143edeec5b6c8d659550 /system/core/Model.php | |
| parent | a9a1d2520493211ca35f7ab56866d0e154afc1c3 (diff) | |
| parent | f2b19fee7876708c7a7bb5cba6b7df682a9d2a53 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Model.php')
| -rw-r--r-- | system/core/Model.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/system/core/Model.php b/system/core/Model.php index 9bc9f879f..5a87ab153 100644 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -26,7 +26,7 @@ */ /** - * CodeIgniter Model Class + * Model Class * * @package CodeIgniter * @subpackage Libraries @@ -37,7 +37,7 @@ class CI_Model { /** - * Initialize CI_Model Class + * Class constructor * * @return void */ @@ -46,13 +46,15 @@ class CI_Model { log_message('debug', 'Model Class Initialized'); } + // -------------------------------------------------------------------- + /** - * __get + * __get magic * * Allows models to access CI's loaded classes using the same * syntax as controllers. * - * @param string + * @param string $key */ public function __get($key) { |