diff options
| author | Pascal Kriete <pascal@pascalkriete.com> | 2011-11-14 21:15:15 +0100 |
|---|---|---|
| committer | Pascal Kriete <pascal@pascalkriete.com> | 2011-11-14 21:15:15 +0100 |
| commit | f525f10c850399700a4cce183aef55656ff44d31 (patch) | |
| tree | d0250655551d773c9347573e594997e07d7280a5 /system/core/Model.php | |
| parent | 44cdece942c310f5520497dbde4febc26e96c27e (diff) | |
| parent | 917c3455cc70d5117daa7359f345a820154ada3e (diff) | |
Merge branch 'release/2.1.0'
Conflicts:
user_guide/helpers/url_helper.html
Diffstat (limited to 'system/core/Model.php')
| -rwxr-xr-x[-rw-r--r--] | system/core/Model.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/system/core/Model.php b/system/core/Model.php index 8566a0b66..e15ffbebc 100644..100755 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -42,6 +42,7 @@ class CI_Model { * Allows models to access CI's loaded classes using the same * syntax as controllers. * + * @param string * @access private */ function __get($key) |