Minahito
minah****@users*****
2006年 10月 5日 (木) 19:17:53 JST
Index: xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.4.2.1
--- xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.4 Wed Aug 2 12:04:42 2006
+++ xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php Thu Oct 5 19:17:53 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Id: InstallWizardAction.class.php,v 1.1.2.4 2006/08/02 03:04:42 minahito Exp $
+ * @version $Id: InstallWizardAction.class.php,v 1.1.2.4.2.1 2006/10/05 10:17:53 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -36,7 +36,7 @@
$this->mLicence = $this->mModuleObject->modinfo['installer']['licence']['title'];
$file = $this->mModuleObject->modinfo['installer']['licence']['file'];
- $language = $root->mController->getConfig('language');
+ $language = $root->mContext->getXoopsConfig('language');
//
// TODO Replace with language manager.
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.1 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.15.2.2
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.15.2.1 Thu Oct 5 18:06:38 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php Thu Oct 5 19:17:53 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: HelpAction.class.php,v 1.1.2.15.2.1 2006/10/05 09:06:38 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.15.2.2 2006/10/05 10:17:53 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -66,7 +66,7 @@
function Legacy_modifier_helpurl($file, $dirname = null )
{
$root =& XCube_Root::getSingleton();
- $language = $root->mController->getConfig('language');
+ $language = $root->mContext->getXoopsConfig('language');
if ( $dirname == null ) {
$moduleObject =& $root->mContext->mXoopsModule;
@@ -87,7 +87,7 @@
$root =& XCube_Root::getSingleton();
$moduleObject =& $root->mContext->mXoopsModule;
- $language = $root->mController->getConfig('language');
+ $language = $root->mContext->getXoopsConfig('language');
$dirname = $moduleObject->get('dirname');
$url = XOOPS_MODULE_URL . "/${dirname}/language/${language}/help/images/${file}";
@@ -144,7 +144,7 @@
$moduleHandler =& xoops_gethandler('module');
$this->mModuleObject =& $moduleHandler->getByDirname($this->_mDirname);
- $language =& $controller->getConfig('language');
+ $language =& $controller->mRoot->mContext->getXoopsConfig('language');
//
// TODO We must change the following lines to ActionForm.