Skip to content

Commit 5506af8

Browse files
committed
Updating file headers.
Removing Object::$_log. CakeLog is now called statically. Saving an instance is not longer necessary or desired.
1 parent c238d4d commit 5506af8

File tree

2 files changed

+7
-25
lines changed

2 files changed

+7
-25
lines changed

cake/libs/log/file_log.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
* Licensed under The MIT License
1212
* Redistributions of files must retain the above copyright notice.
1313
*
14-
* @filesource
1514
* @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
1615
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
1716
* @package cake
@@ -23,8 +22,8 @@
2322
/**
2423
* File Storage stream for Logging
2524
*
26-
* @package cake
27-
* @subpackage cake.cake.libs.log
25+
* @package cake
26+
* @subpackage cake.cake.libs.log
2827
*/
2928
class FileLog {
3029

cake/libs/object.php

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<?php
2-
/* SVN FILE: $Id$ */
3-
42
/**
53
* Object class, allowing __construct and __destruct in PHP4.
64
*
@@ -10,20 +8,16 @@
108
* PHP versions 4 and 5
119
*
1210
* 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)
1412
*
1513
* Licensed under The MIT License
1614
* Redistributions of files must retain the above copyright notice.
1715
*
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)
2017
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
2118
* @package cake
2219
* @subpackage cake.cake.libs
2320
* @since CakePHP(tm) v 0.2.9
24-
* @version $Revision$
25-
* @modifiedby $LastChangedBy$
26-
* @lastmodified $Date$
2721
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
2822
*/
2923

@@ -33,19 +27,11 @@
3327
* Also includes methods for logging and the special method RequestAction,
3428
* to call other Controllers' Actions from anywhere.
3529
*
36-
* @package cake
37-
* @subpackage cake.cake.libs
30+
* @package cake
31+
* @subpackage cake.cake.libs
3832
*/
3933
class Object {
4034

41-
/**
42-
* Log object
43-
*
44-
* @var CakeLog
45-
* @access protected
46-
*/
47-
var $_log = null;
48-
4935
/**
5036
* A hack to support __construct() on PHP 4
5137
* Hint: descendant classes have no PHP4 class_name() constructors,
@@ -160,13 +146,10 @@ function log($msg, $type = LOG_ERROR) {
160146
if (!class_exists('CakeLog')) {
161147
require LIBS . 'cake_log.php';
162148
}
163-
if (is_null($this->_log)) {
164-
$this->_log = new CakeLog();
165-
}
166149
if (!is_string($msg)) {
167150
$msg = print_r($msg, true);
168151
}
169-
return $this->_log->write($type, $msg);
152+
return CakeLog::write($type, $msg);
170153
}
171154

172155
/**

0 commit comments

Comments
 (0)