NobuNobu
nobun****@users*****
2006年 10月 8日 (日) 21:15:23 JST
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.10 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.11
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.10 Sat Oct 7 17:26:33 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Sun Oct 8 21:15:23 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: Legacy_Controller.class.php,v 1.1.2.79.2.10 2006/10/07 08:26:33 minahito Exp $
+ * @version $Id: Legacy_Controller.class.php,v 1.1.2.79.2.11 2006/10/08 12:15:23 nobunobu Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -578,13 +578,16 @@
function _setupConfig()
{
$configHandler=&xoops_gethandler('config');
- $this->mConfig=&$configHandler->getConfigsByCat(XOOPS_CONF);
- $this->mRoot->mContext->mXoopsConfig =& $this->mConfig;
+
+ $config =& $configHandler->getConfigsByCat(XOOPS_CONF);
+
+ $this->setTheme($config['theme_set']);
+ $config['language'] = $this->mRoot->mLanguageManager->getLanguage();
+
+ $this->mRoot->mContext->mXoopsConfig =& $config;
+ $this->mConfig =& $config; // Compatiblity for 2.1Alpha
+ $GLOBALS['xoopsConfig'] =& $config; // Compatiblity for 2.0.x
- $this->setTheme($this->mConfig['theme_set']);
- $this->mConfig['language'] = $this->mRoot->mLanguageManager->getLanguage();
-
- $GLOBALS['xoopsConfig'] =& $this->mRoot->mContext->mXoopsConfig;
$GLOBALS['config_handler'] =& $configHandler;
}
@@ -598,7 +601,7 @@
require_once XOOPS_BASE_PATH . "/class/DebuggerManager.class.php";
- $debug_mode = $this->mConfig['debug_mode'];
+ $debug_mode = $this->mRoot->mContext->mXoopsConfig['debug_mode'];
if (defined("OH_MY_GOD_HELP_ME")) {
$debug_mode = XOOPS_DEBUG_PHP;
}
@@ -698,7 +701,7 @@
//
$xoopsModule =& $this->mRoot->mContext->mXoopsModule;
- $cachetime = $this->mConfig['module_cache'][$xoopsModule->get('mid')];
+ $cachetime = $this->mRoot->mContext->mXoopsConfig['module_cache'][$xoopsModule->get('mid')];
$filepath = $this->getModuleCacheFilePath($cacheInfo);
//
@@ -726,7 +729,7 @@
function setTheme($theme)
{
$this->mTheme = $theme;
- $this->mConfig['theme_set'] = $theme;
+ $this->mRoot->mContext->mXoopsConfig['theme_set'] = $theme;
}
function executeView()
@@ -1238,7 +1241,8 @@
}
function _setupFilterChain()
- {
$primaryPreloads = $this->mController->mRoot->getSiteConfig('Legacy.PrimaryPreloads');
+ {
+ $primaryPreloads = $this->mController->mRoot->getSiteConfig('Legacy.PrimaryPreloads');
foreach ($primaryPreloads as $className => $classPath) {
if (file_exists(XOOPS_ROOT_PATH . $classPath)) {
require_once XOOPS_ROOT_PATH . $classPath;