8b09d67a5e659f199cf2a3bac8ee1d091603f0d9
Author: Mark Story
Date: 2009-09-03 13:39:31 -0400
diff --git a/vendors/debug_kit_debugger.php b/vendors/debug_kit_debugger.php
index d1d43f4..f940946 100644
--- a/vendors/debug_kit_debugger.php
+++ b/vendors/debug_kit_debugger.php
@@ -289,7 +289,7 @@ class DebugKitDebugger extends Debugger {
* If you don't have memory_get_xx methods this will not work.
*
* @param string $message Message to identify this memory point.
- * @return boolean
+ * @return boolean
**/
function setMemoryPoint($message = null) {
$memoryUse = DebugKitDebugger::getMemoryUse();
@@ -339,41 +339,37 @@ class DebugKitDebugger extends Debugger {
* @param string $var Object to convert
* @access protected
*/
- function _output($level, $error = null, $code = null, $helpCode = null, $description = null, $file = null, $line = null, $kontext = null) {
+ function _output($data = array()) {
+ extract($data);
if (is_array($level)) {
$error = $level['error'];
$code = $level['code'];
- if (isset($helpID)) {
- $helpCode = $level['helpID'];
+ if (isset($level['helpID'])) {
+ $helpID = $level['helpID'];
} else {
- $helpCode = '';
+ $helpID = '';
}
$description = $level['description'];
$file = $level['file'];
$line = $level['line'];
- $kontext = $level['context'];
+ $context = $level['context'];
$level = $level['level'];
- $compact = true;
}
$files = $this->trace(array('start' => 2, 'format' => 'points'));
$listing = $this->excerpt($files[0]['file'], $files[0]['line'] - 1, 1);
$trace = $this->trace(array('start' => 2, 'depth' => '20'));
- $context = array();
- foreach ((array)$kontext as $var => $value) {
- $context[] = "\${$var}\t=\t" . $this->exportVar($value, 1);
- }
if ($this->_outputFormat == 'fb') {
- $this->_fireError($error, $code, $description, $file, $line, $trace, $context);
- } else {
- if (!empty($compact)) {
- $result = compact('level', 'error', 'code', 'description', 'file', 'line');
- $result['helpID'] = $helpCode;
- $result['context'] = $kontext;
- echo parent::_output($result);
- } else {
- echo parent::_output($level, $error, $code, $helpCode, $description, $file, $line, $kontext);
+ $kontext = array();
+ foreach ((array)$context as $var => $value) {
+ $kontext[] = "\${$var}\t=\t" . $this->exportVar($value, 1);
}
+ $this->_fireError($error, $code, $description, $file, $line, $trace, $kontext);
+ } else {
+ $data = compact(
+ 'level', 'error', 'code', 'helpID', 'description', 'file', 'path', 'line', 'context'
+ );
+ echo parent::_output($data);
}
}
/**
