Minahito
minah****@users*****
2006年 4月 28日 (金) 15:47:13 JST
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.31 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.32
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.31 Wed Apr 19 14:27:59 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Fri Apr 28 15:47:13 2006
@@ -332,16 +332,17 @@
{
error_reporting(0);
- require_once XOOPS_BASE_PATH."/class/debug/XoopsDebugManager.class.php";
+ require_once XOOPS_BASE_PATH . "/class/DebuggerManager.class.php";
$debug_mode = $this->mConfig['debug_mode'];
- if(defined("OH_MY_GOD_HELP_ME"))
+ if (defined("OH_MY_GOD_HELP_ME")) {
$debug_mode = XOOPS_DEBUG_PHP;
+ }
+
+ $this->mDebugger =& Legacy_DebuggerManager::getInstance($debug_mode);
+ $this->mDebugger->prepare();
- $this->mDebugger=&XoopsDebuggerManager::getInstance($debug_mode);
- $this->mDebugger->setup();
-
- $GLOBALS['xoopsDebugger']=&$this->mDebugger;
+ $GLOBALS['xoopsDebugger'] =& $this->mDebugger;
}
function _processPreBlockFilter()
@@ -532,21 +533,24 @@
$this->mRenderSystem->renderWithTarget($screenTarget);
- $isAdmin=false;
- if(is_object($this->mXoopsUser)) {
- if($this->mModuleController->isModuleProcess() && $this->mModuleController->isActive()) {
+ //
+ // Debug Process
+ //
+ $isAdmin = false;
+ if (is_object($this->mXoopsUser)) {
+ if ($this->mModuleController->isModuleProcess() && $this->mModuleController->isActive()) {
// @todo I depend on Legacy Module Controller.
$mid=$this->mModuleController->mModuleObject->getVar('mid');
}
- else
+ else {
$mid=1; ///< @todo Do not use literal directly!
+ }
$isAdmin = $this->mXoopsUser->isAdmin($mid);
}
- // Debug Process
- if ($this->mConfig['debug_mode'] == XOOPS_DEBUG_MYSQL && $isAdmin) {
- $xoopsDebugger->displayLog();
+ if ($isAdmin) {
+ $this->mDebugger->displayLog();
}
}