diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-01-24 22:37:20 +0100 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-01-24 22:37:20 +0100 |
| commit | 8f9e93dd37ae0090c9b4117138cd3135bfe3f67a (patch) | |
| tree | 3f49040d696e760381642f2d2ffa407cee1dc039 /system/core/Model.php | |
| parent | de15a0b7377db0ef3b1d43508401be3c2927c0ff (diff) | |
| parent | 96db8f91c34c18119548cacc4692362f51e70407 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Model.php')
| -rwxr-xr-x | system/core/Model.php | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/system/core/Model.php b/system/core/Model.php index c34bab64b..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: @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com * @since Version 1.0 @@ -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 */ |