Minahito
minah****@users*****
2006年 10月 14日 (土) 17:26:10 JST
Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.15.2.1 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.15.2.2
--- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.15.2.1 Fri Oct 6 18:47:02 2006
+++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php Sat Oct 14 17:26:10 2006
@@ -256,7 +256,7 @@
function hasPermission(&$controller, &$xoopsUser)
{
- Legacy_RoleManager::loadRolesByModule($this->_mMaster->mModule);
+ $controller->mRoot->mRoleManager->loadRolesByModule($this->_mMaster->mModule);
return $controller->mRoot->mContext->mUser->isInRole('Module.' . $this->_mMaster->mModule->get('dirname') . '.Admin');
}
Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.15.2.3 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.15.2.4
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.15.2.3 Fri Oct 6 18:46:45 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php Sat Oct 14 17:26:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: HelpAction.class.php,v 1.1.2.15.2.3 2006/10/06 09:46:45 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.15.2.4 2006/10/14 08:26:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -136,7 +136,7 @@
function hasPermission(&$controller, &$xoopsUser)
{
$dirname = xoops_getrequest('dirname');
- Legacy_RoleManager::loadRolesByDirname($this->_mDirname);
+ $controller->mRoot->mRoleManager->loadRolesByDirname($this->_mDirname);
return $controller->mRoot->mContext->mUser->isInRole('Module.' . $dirname . '.Admin');
}
Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10.2.2 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10.2.3
--- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10.2.2 Fri Oct 13 18:20:34 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php Sat Oct 14 17:26:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ModuleListAction.class.php,v 1.1.2.10.2.2 2006/10/13 09:20:34 minahito Exp $
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.10.2.3 2006/10/14 08:26:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -109,7 +109,7 @@
{
$render->setTemplateName("module_list.html");
$render->setAttribute('actionForm', $this->mActionForm);
-
+
//
// Load adminmenu before we assign these to template.
//
@@ -117,6 +117,7 @@
$this->mModuleObjects[$key]->loadAdminMenu();
$this->mModuleObjects[$key]->loadInfo($this->mModuleObjects[$key]->get('dirname'));
}
+
$render->setAttribute('moduleObjects', $this->mModuleObjects);
}