Minahito
minah****@users*****
2006年 10月 5日 (木) 18:06:55 JST
Index: xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php
diff -u xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.10.2.1 xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.10.2.2
--- xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.10.2.1 Thu Sep 28 14:01:28 2006
+++ xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php Thu Oct 5 18:06:54 2006
@@ -12,7 +12,7 @@
*
* @package legacy
*/
-class Legacy_AdminSideMenu extends Legacy_BlockProcedure
+class Legacy_AdminSideMenu extends Legacy_AbstractBlockProcedure
{
var $mModules = array();
@@ -38,14 +38,21 @@
return 0;
}
- function enableCached()
+ function enableCache()
{
return false;
}
- function execute(&$controller, &$user, &$render)
+ function execute()
{
- $this->mCurrentModule =& $controller->mModuleController->mModuleObject;
+ $root =& XCube_Root::getSingleton();
+
+ $controller =& $root->mController;
+ $user =& $root->mController->mRoot->mContext->mXoopsUser;
+ $render =& $this->getRenderBuffer();
+
+ $this->mCurrentModule =& $controller->mRoot->mContext->mXoopsModule;
+
if ($this->mCurrentModule->get('dirname') == 'base') {
if (xoops_getrequest('action') == "help") {
$moduleHandler =& xoops_gethandler('module');
@@ -101,16 +108,10 @@
$render->setTemplateName('legacy_admin_block_sidemenu.html');
$render->setAttribute('modules', $this->mModules);
$render->setAttribute('currentModule', $this->mCurrentModule);
- }
-
- function hasResult()
- {
- return true;
- }
-
- function getRenderSystemName()
- {
- return 'Legacy_AdminRenderSystem';
+
+ $renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
+
+ $renderSystem->renderBlock($render);
}
}
Index: xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php
diff -u xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.4.2.1 xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.4.2.2
--- xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.4.2.1 Thu Sep 28 14:01:28 2006
+++ xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php Thu Oct 5 18:06:54 2006
@@ -10,7 +10,7 @@
*
* @package legacy
*/
-class Legacy_AdminActionSearch extends Legacy_BlockProcedure
+class Legacy_AdminActionSearch extends Legacy_AbstractBlockProcedure
{
function getName()
{
@@ -32,9 +32,15 @@
return false;
}
- function execute(&$controller, &$user, &$render)
+ function execute()
{
+ $render =& $this->getRenderBuffer();
$render->setTemplateName('legacy_admin_block_actionsearch.html');
+
+ $root =& XCube_Root::getSingleton();
+ $renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
+
+ $renderSystem->renderBlock($render);
}
function hasResult()