From 426bf45f9836defe9c53ee5ffac5a406140a1d2c Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sun, 3 Dec 2006 17:35:30 +0000
Subject: [PATCH] Reverting changes in [4055]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4057 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/configure.php | 33 +--------------------------------
 cake/libs/object.php    | 19 +++++++------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index b58660bd2..95327f53f 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -77,13 +77,6 @@ class Configure extends Object {
  * @access public
  */
 	var $behaviorPaths = array();
-/**
- * Debug level
- *
- * @var integer
- * @access private
- */
-	var $__debug = null;
 /**
  * Return a singleton instance of Configure.
  *
@@ -212,30 +205,6 @@ class Configure extends Object {
 		$_this->__buildComponentPaths($componentPaths);
 		$_this->__buildBehaviorPaths($behaviorPaths);
 	}
-/**
- * Sets the debug level
- *
- * - 1: development
- * - 2: full debug with sql
- * - 3: full debug with sql and dump of the current object
- *
- * @param string $level
- * @return void
- * @access public
- */
-	function debugLevel($level = DEBUG) {
-		$_this =& Configure::getInstance();
-		$_this->__debug = $level;
-	}
-/**
- * Return the debug level
- *
- * @return interger
- * @access public
- */
-	function debug() {
-		$_this =& Configure::getInstance();
-		return $_this->__debug;
-	}
 }
+
 ?>
\ No newline at end of file
diff --git a/cake/libs/object.php b/cake/libs/object.php
index d06e33d88..8dafd0d3b 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -63,17 +63,7 @@ class Object{
  */
 	function __construct() {
 	}
-/**
- * Used to set the debug level at a class level
- * This will override the DEBUG define
- *
- * @param integer $level defaults to the DEBUG in core.php if no value is set.
- * @return void
- * @access public
- */
-	function debug($level = DEBUG){
-		Configure::debugLevel($level);
-	}
+
 /**
  * Object-to-string conversion.
  * Each class can override this method as necessary.
@@ -153,7 +143,12 @@ class Object{
  * @return string
  */
 	function trace($options = array()) {
-		$options = am(array('depth' => null, 'format' => ''), $options);
+		$options = am(array(
+				'depth' => null,
+				'format' => ''
+			),
+			$options
+		);
 
 		$backtrace = debug_backtrace();
 		$back = array();