Minahito
minah****@users*****
2006年 11月 9日 (木) 15:11:30 JST
Index: xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.3 Wed Nov 8 19:53:39 2006
+++ xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php Thu Nov 9 15:11:30 2006
@@ -66,7 +66,9 @@
function Legacy_modifier_helpurl($file, $dirname = null )
{
$root =& XCube_Root::getSingleton();
+
$language = $root->mContext->getXoopsConfig('language');
+ $dirname = $root->mContext->getAttribute('legacy_help_dirname');
if ( $dirname == null ) {
$moduleObject =& $root->mContext->mXoopsModule;
@@ -85,10 +87,9 @@
function Legacy_modifier_helpimage($file)
{
$root =& XCube_Root::getSingleton();
- $moduleObject =& $root->mContext->mXoopsModule;
$language = $root->mContext->getXoopsConfig('language');
- $dirname = $moduleObject->get('dirname');
+ $dirname = $root->mContext->getAttribute('legacy_help_dirname');
$url = XOOPS_MODULE_URL . "/${dirname}/language/${language}/help/images/${file}";
if (!file_exists($url) && $language != "english") {
@@ -172,6 +173,8 @@
return LEGACY_FRAME_VIEW_ERROR;
}
}
+
+ $controller->mRoot->mContext->setAttribute('legacy_help_dirname', $this->_mDirname);
$smarty->template_dir = $template_dir;
$this->mContents = $smarty->fetch("file:" . $helpfile);