diff options
| author | dchill42 <dchill42@gmail.com> | 2012-07-23 16:53:47 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-07-23 16:53:47 +0200 |
| commit | c5079de78e5141330c07e990811ef15e998e95aa (patch) | |
| tree | 0f39d8c4fc7614246fc185810bfeaa7fad88a33a /system/core/Model.php | |
| parent | 00fcb545109d4e61bc14e403ec828749c34a54b3 (diff) | |
| parent | ede49ba66b127535f3430e20aac72ceed2c4611a (diff) | |
Merge branch develop of github.com:/EllisLab/CodeIgniter into session
Diffstat (limited to 'system/core/Model.php')
| -rw-r--r--[-rwxr-xr-x] | system/core/Model.php | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/system/core/Model.php b/system/core/Model.php index e15ffbebc..9bc9f879f 100755..100644 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -1,39 +1,49 @@ -<?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 + * An open source application development framework for PHP 5.2.4 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: + * http://opensource.org/licenses/OSL-3.0 + * If you did not receive a copy of the license and are unable to obtain it + * through the world wide web, please send an email to + * licensing@ellislab.com so we can send you a copy immediately. * * @package CodeIgniter - * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. - * @license http://codeigniter.com/user_guide/license.html + * @author EllisLab Dev Team + * @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 * @filesource */ -// ------------------------------------------------------------------------ - /** * CodeIgniter Model Class * * @package CodeIgniter * @subpackage Libraries * @category Libraries - * @author ExpressionEngine Dev Team + * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/libraries/config.html */ class CI_Model { /** - * Constructor + * Initialize CI_Model Class * - * @access public + * @return void */ - function __construct() + public function __construct() { - log_message('debug', "Model Class Initialized"); + log_message('debug', 'Model Class Initialized'); } /** @@ -43,15 +53,14 @@ 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 |