Minahito
minah****@users*****
2006年 10月 21日 (土) 20:36:03 JST
Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.4 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.5
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.4 Fri Oct 20 17:06:50 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Sat Oct 21 20:36:03 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.4 2006/10/20 08:06:50 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.5 2006/10/21 11:36:03 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -146,9 +146,10 @@
function renderBlock(&$target)
{
- $this->mXoopsTpl->assign('xoops_theme', $this->mController->getTheme());
- $this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . '/' . $this->mController->getTheme() . '/');
- $this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($this->mController->getTheme()));
+ $themeName = $this->mController->mRoot->mContext->getThemeName();
+ $this->mXoopsTpl->assign('xoops_theme', $themeName);
+ $this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
+ $this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
if (isset($GLOBALS['xoopsUserIsAdmin'])) {
$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
@@ -214,9 +215,10 @@
function renderMain(&$target)
{
- $this->mXoopsTpl->assign('xoops_theme', $this->mController->getTheme());
- $this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . '/' . $this->mController->getTheme() . '/');
- $this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($this->mController->getTheme()));
+ $themeName = $this->mController->mRoot->mContext->getThemeName();
+ $this->mXoopsTpl->assign('xoops_theme', $themeName);
+ $this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
+ $this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
if (isset($GLOBALS['xoopsUserIsAdmin'])) {
$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
@@ -248,9 +250,10 @@
function renderTheme(&$target)
{
- $this->mXoopsTpl->assign('xoops_theme', $this->mController->getTheme());
- $this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . '/' . $this->mController->getTheme() . '/');
- $this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($this->mController->getTheme()));
+ $themeName = $this->mController->mRoot->mContext->getThemeName();
+ $this->mXoopsTpl->assign('xoops_theme', $themeName);
+ $this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
+ $this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
if (isset($GLOBALS['xoopsUserIsAdmin'])) {
$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);