adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverting changes in [4055]

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4057 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-12-03 17:35:30 +00:00
parent 798298e251
commit 426bf45f98
2 changed files with 8 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
cake/libs/configure.php
View file

@ -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;
}
}
?>

19
cake/libs/object.php
View file

@ -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();