Minahito
minah****@users*****
2006年 8月 4日 (金) 13:34:43 JST
Index: xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.17 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.18
--- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.17 Thu Aug 3 18:36:06 2006
+++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php Fri Aug 4 13:34:43 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: Legacy_AdminModuleController.class.php,v 1.1.2.17 2006/08/03 09:36:06 minahito Exp $
+ * @version $Id: Legacy_AdminModuleController.class.php,v 1.1.2.18 2006/08/04 04:34:43 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -74,20 +74,23 @@
/**
@return void
*/
- function _createModuleObject()
+ function setupModuleObject($dirname = null)
{
- $dirname=$this->_getDirname();
- $moduleHandler=&xoops_gethandler('module');
+ if ($dirname == null) {
+ $dirname = $this->_getDirname();
+ }
+
+ $moduleHandler =& xoops_gethandler('module');
//
// When user accesses to root/admin.php, $dirname is null.
//
- $module=null;
- if($dirname!=null) {
+ $module = null;
+ if($dirname != null) {
$module=&$moduleHandler->getByDirname($dirname);
}
else {
- $module=&$moduleHandler->getByDirname("base");
+ $module =& $moduleHandler->getByDirname("base");
}
//
@@ -95,7 +98,7 @@
//
$GLOBALS['xoopsModule']=&$module;
- $dmy=&$module->getInfo();
+ $dmy =& $module->getInfo();
//
// Load admin menu, and add preference menu by own judge.
@@ -105,12 +108,12 @@
|| ($module->getInfo('config') && is_array($module->getInfo('config')))
|| ($module->getInfo('comments') && is_array($module->getInfo('comments')))) {
$module->adminmenu[] = array(
- 'link' => XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&confmod_id='.$module->getVar('mid'),
+ 'link' => XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->getVar('mid'),
'title' => _PREFERENCES,
'absolute' => true);
}
- $this->mModuleObject=&$module;
+ $this->mModuleObject =& $module;
}