Minahito
minah****@users*****
2006年 10月 5日 (木) 18:07:31 JST
Index: xoops2jp/html/modules/base/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.1 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.2
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.1 Thu Sep 28 14:01:41 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php Thu Oct 5 18:07:31 2006
@@ -101,9 +101,9 @@
die();
}
- $this->mAction->prepare($controller, $controller->getXoopsUser());
+ $this->mAction->prepare($controller, $controller->mRoot->mContext->mXoopsUser);
- if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser())) {
+ if (!$this->mAction->hasPermission($controller, $controller->mRoot->mContext->mXoopsUser)) {
if ($this->mAdminFlag) {
$controller->executeForward(XOOPS_URL . "/admin.php");
}
@@ -113,35 +113,35 @@
}
if (xoops_getenv("REQUEST_METHOD") == "POST") {
- $viewStatus = $this->mAction->execute($controller, $controller->getXoopsUser());
+ $viewStatus = $this->mAction->execute($controller, $controller->mRoot->mContext->mXoopsUser);
}
else {
- $viewStatus = $this->mAction->getDefaultView($controller, $controller->getXoopsUser());
+ $viewStatus = $this->mAction->getDefaultView($controller, $controller->mRoot->mContext->mXoopsUser);
}
switch($viewStatus) {
case LEGACY_FRAME_VIEW_SUCCESS:
- $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case LEGACY_FRAME_VIEW_ERROR:
- $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case LEGACY_FRAME_VIEW_INDEX:
- $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case LEGACY_FRAME_VIEW_INPUT:
- $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case LEGACY_FRAME_VIEW_PREVIEW:
- $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case LEGACY_FRAME_VIEW_CANCEL:
- $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
}
}
Index: xoops2jp/html/modules/base/class/DebuggerManager.class.php
diff -u xoops2jp/html/modules/base/class/DebuggerManager.class.php:1.1.2.2 xoops2jp/html/modules/base/class/DebuggerManager.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/class/DebuggerManager.class.php:1.1.2.2 Sat Jun 17 00:51:21 2006
+++ xoops2jp/html/modules/base/class/DebuggerManager.class.php Thu Oct 5 18:07:31 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: DebuggerManager.class.php,v 1.1.2.2 2006/06/16 15:51:21 nobunobu Exp $
+// $Id: DebuggerManager.class.php,v 1.1.2.2.2.1 2006/10/05 09:07:31 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -152,7 +152,7 @@
function isDebugRenderSystem()
{
$root =& XCube_Root::getSingleton();
- $user =& $root->mController->getXoopsUser();
+ $user =& $root->mContext->mXoopsUser;
return is_object($user) ? $user->isAdmin(0) : false;
}