diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-08 04:19:53 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-08 04:19:53 +0100 |
| commit | bf70d6245046d743573c604aeda3280870e19e41 (patch) | |
| tree | 63e5dd015b2121bc547ed2ecadbb80dfda3cfb3d /system/core/Model.php | |
| parent | bb488dc3d4bbac9ac9a1860f066069e4bb4afdcb (diff) | |
| parent | 352d60e9f3a65def29e02a4507ef742eac255333 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-core-security
Diffstat (limited to 'system/core/Model.php')
| -rwxr-xr-x | system/core/Model.php | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/system/core/Model.php b/system/core/Model.php index fc640139a..a595a6ae2 100755 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.1.6 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Open Software License version 3.0 - * + * * This source file is subject to the Open Software License (OSL 3.0) that is * bundled with this package in the files license.txt / license.rst. It is * also available through the world wide web at this URL: @@ -38,14 +38,9 @@ */ class CI_Model { - /** - * Constructor - * - * @access public - */ - function __construct() + public function __construct() { - log_message('debug', "Model Class Initialized"); + log_message('debug', 'Model Class Initialized'); } /** @@ -55,15 +50,13 @@ class CI_Model { * syntax as controllers. * * @param string - * @access private */ - function __get($key) + public function __get($key) { $CI =& get_instance(); return $CI->$key; } } -// END Model Class /* End of file Model.php */ -/* Location: ./system/core/Model.php */
\ No newline at end of file +/* Location: ./system/core/Model.php */ |