From 5506af8fccdd6b0ba10c58ae1f36cd4b58e6b988 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 5 Nov 2009 23:21:40 -0500
Subject: [PATCH] Updating file headers. Removing Object::$_log.  CakeLog is
 now called statically.  Saving an instance is not longer necessary or
 desired.

---
 cake/libs/log/file_log.php |  5 ++---
 cake/libs/object.php       | 27 +++++----------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php
index 8bdbd39d2..483f1dbb8 100644
--- a/cake/libs/log/file_log.php
+++ b/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 {
 
diff --git a/cake/libs/object.php b/cake/libs/object.php
index fee862131..86e6c59aa 100644
--- a/cake/libs/object.php
+++ b/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,19 +27,11 @@
  * 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,
@@ -160,13 +146,10 @@ class Object {
 		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);
 	}
 
 /**