Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updating file headers.

Removing Object::$_log.  CakeLog is now called statically.  Saving an instance is not longer necessary or desired.
  • Loading branch information...
commit 5506af8fccdd6b0ba10c58ae1f36cd4b58e6b988 1 parent c238d4d
@markstory markstory authored
Showing with 7 additions and 25 deletions.
  1. +2 −3 cake/libs/log/file_log.php
  2. +5 −22 cake/libs/object.php
View
5 cake/libs/log/file_log.php
@@ -11,7 +11,6 @@
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
* @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
* @package cake
@@ -23,8 +22,8 @@
/**
* File Storage stream for Logging
*
- * @package cake
- * @subpackage cake.cake.libs.log
+ * @package cake
+ * @subpackage cake.cake.libs.log
*/
class FileLog {
View
27 cake/libs/object.php
@@ -1,6 +1,4 @@
<?php
-/* SVN FILE: $Id$ */
-
/**
* Object class, allowing __construct and __destruct in PHP4.
*
@@ -10,20 +8,16 @@
* PHP versions 4 and 5
*
* CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
- * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
* @package cake
* @subpackage cake.cake.libs
* @since CakePHP(tm) v 0.2.9
- * @version $Revision$
- * @modifiedby $LastChangedBy$
- * @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
@@ -33,20 +27,12 @@
* Also includes methods for logging and the special method RequestAction,
* to call other Controllers' Actions from anywhere.
*
- * @package cake
- * @subpackage cake.cake.libs
+ * @package cake
+ * @subpackage cake.cake.libs
*/
class Object {
/**
- * Log object
- *
- * @var CakeLog
- * @access protected
- */
- var $_log = null;
-
-/**
* A hack to support __construct() on PHP 4
* Hint: descendant classes have no PHP4 class_name() constructors,
* so this constructor gets called first and calls the top-layer __construct()
@@ -160,13 +146,10 @@ function log($msg, $type = LOG_ERROR) {
if (!class_exists('CakeLog')) {
require LIBS . 'cake_log.php';
}
- if (is_null($this->_log)) {
- $this->_log = new CakeLog();
- }
if (!is_string($msg)) {
$msg = print_r($msg, true);
}
- return $this->_log->write($type, $msg);
+ return CakeLog::write($type, $msg);
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.