[xoops-cvslog 3545] CVS update: xoops2jp/html/modules/base/kernel

Back to archive index

Minahito minah****@users*****
2006年 7月 11日 (火) 19:06:48 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.46 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.47
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.46	Mon Jul 10 13:49:04 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Tue Jul 11 19:06:48 2006
@@ -397,7 +397,7 @@
 		$configHandler=&xoops_gethandler('config');
 		$this->mConfig=&$configHandler->getConfigsByCat(XOOPS_CONF);
 
-		$this->mRoot->setThemeName($this->mConfig['theme_set']);
+		$this->setMainTheme($this->mConfig['theme_set']);
 		if ($this->mLanguage) {
 		    $this->mConfig['language'] = $this->mLanguage;
         }
@@ -567,6 +567,15 @@
 	{
 		return $this->mConfig['module_cache'][$xoopsModule->getVar('mid')];
 	}
+
+	/**
+	 * @var string $theme
+	 */	
+	function setMainTheme($theme)
+	{
+		$this->mMainTheme = $theme;
+		$this->mConfig['theme_set'] = $theme;
+	}
 	
 	function executeView()
 	{
@@ -620,7 +629,7 @@
 		// Theme Control
 		//
 		$screenTarget=$this->mDialogMode ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget();
-		$screenTarget->setTemplateName($this->mRoot->getThemeName());
+		$screenTarget->setTemplateName($this->getMainTheme());
 		
 		$screenTarget->setAttribute('xoops_contents',$resultRenderTarget->getResult());
 


xoops-cvslog メーリングリストの案内
Back to archive index