Minahito
minah****@users*****
2006年 11月 7日 (火) 18:56:04 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.7 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.8
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.7 Mon Oct 30 20:46:25 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Tue Nov 7 18:56:04 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.7 2006/10/30 11:46:25 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.8 2006/11/07 09:56:04 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -70,6 +70,7 @@
$this->mXoopsTpl->assign(array('xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), //@todo ?????????????
'xoops_sitename' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['sitename'], ENT_QUOTES),
'xoops_pagetitle' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES),
+ 'xoops_slogan' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES),
// set JavaScript/Weird, but need extra <script> tags for 2.0.x themes
'xoops_js' => '//--></script><script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script><script type="text/javascript"><!--'
));
@@ -124,21 +125,6 @@
);
}
- //
- // Assign module informations.
- //
- if($this->mController->mRoot->mContext->mModule != null) { // The process of module
- $xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
- $this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
- 'xoops_dirname' => $xoopsModule->getShow('dirname')));
- if (!$this->mXoopsTpl->get_template_vars('xoops_pagetitle')) {
- $this->mXoopsTpl->assign(array('xoops_pagetitle' => $xoopsModule->getShow('name')));
- }
- }
- else {
- $this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES));
- }
-
$this->mXoopsTpl->assign($arr);
}
@@ -263,6 +249,19 @@
$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
+ //
+ // Assign module informations.
+ //
+ if($this->mController->mRoot->mContext->mModule != null) { // The process of module
+ $xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
+ $this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
+ 'xoops_dirname' => $xoopsModule->getShow('dirname'),
+ 'xoops_pagetitle' => $xoopsModule->getShow('name')));
+ }
+ else {
+ $this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES));
+ }
+
if (isset($GLOBALS['xoopsUserIsAdmin'])) {
$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
}