|
1 | 1 | <?php
|
2 |
| -/* SVN FILE: $Id$ */ |
3 |
| - |
4 | 2 | /**
|
5 | 3 | * Object class, allowing __construct and __destruct in PHP4.
|
6 | 4 | *
|
|
10 | 8 | * PHP versions 4 and 5
|
11 | 9 | *
|
12 | 10 | * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
|
13 |
| - * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org) |
| 11 | + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org) |
14 | 12 | *
|
15 | 13 | * Licensed under The MIT License
|
16 | 14 | * Redistributions of files must retain the above copyright notice.
|
17 | 15 | *
|
18 |
| - * @filesource |
19 |
| - * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org) |
| 16 | + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org) |
20 | 17 | * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
|
21 | 18 | * @package cake
|
22 | 19 | * @subpackage cake.cake.libs
|
23 | 20 | * @since CakePHP(tm) v 0.2.9
|
24 |
| - * @version $Revision$ |
25 |
| - * @modifiedby $LastChangedBy$ |
26 |
| - * @lastmodified $Date$ |
27 | 21 | * @license http://www.opensource.org/licenses/mit-license.php The MIT License
|
28 | 22 | */
|
29 | 23 |
|
|
33 | 27 | * Also includes methods for logging and the special method RequestAction,
|
34 | 28 | * to call other Controllers' Actions from anywhere.
|
35 | 29 | *
|
36 |
| - * @package cake |
37 |
| - * @subpackage cake.cake.libs |
| 30 | + * @package cake |
| 31 | + * @subpackage cake.cake.libs |
38 | 32 | */
|
39 | 33 | class Object {
|
40 | 34 |
|
41 |
| -/** |
42 |
| - * Log object |
43 |
| - * |
44 |
| - * @var CakeLog |
45 |
| - * @access protected |
46 |
| - */ |
47 |
| - var $_log = null; |
48 |
| - |
49 | 35 | /**
|
50 | 36 | * A hack to support __construct() on PHP 4
|
51 | 37 | * Hint: descendant classes have no PHP4 class_name() constructors,
|
@@ -160,13 +146,10 @@ function log($msg, $type = LOG_ERROR) {
|
160 | 146 | if (!class_exists('CakeLog')) {
|
161 | 147 | require LIBS . 'cake_log.php';
|
162 | 148 | }
|
163 |
| - if (is_null($this->_log)) { |
164 |
| - $this->_log = new CakeLog(); |
165 |
| - } |
166 | 149 | if (!is_string($msg)) {
|
167 | 150 | $msg = print_r($msg, true);
|
168 | 151 | }
|
169 |
| - return $this->_log->write($type, $msg); |
| 152 | + return CakeLog::write($type, $msg); |
170 | 153 | }
|
171 | 154 |
|
172 | 155 | /**
|
|
0 commit comments