Minahito
minah****@users*****
2006年 10月 5日 (木) 18:09:58 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.1 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.2
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.1 Thu Sep 28 14:04:21 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Thu Oct 5 18:09:58 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.1 2006/09/28 05:04:21 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.2 2006/10/05 09:09:58 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -107,11 +107,11 @@
// Add User
// --------------------------------------
$arr = null;
- if (is_object($this->mController->mXoopsUser)) {
+ if (is_object($this->mController->mRoot->mContext->mXoopsUser)) {
$arr = array(
'xoops_isuser' => true,
- 'xoops_userid' => $this->mController->mXoopsUser->getShow('uid'),
- 'xoops_uname' => $this->mController->mXoopsUser->getShow('uname')
+ 'xoops_userid' => $this->mController->mRoot->mContext->mXoopsUser->getShow('uid'),
+ 'xoops_uname' => $this->mController->mRoot->mContext->mXoopsUser->getShow('uname')
);
}
else {
@@ -123,8 +123,8 @@
//
// Assign module informations.
//
- if($this->mController->mModuleController->isModuleProcess()) { // The process of module
- $xoopsModule=&$this->mController->mModuleController->mModuleObject;
+ 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')) {
@@ -431,6 +431,15 @@
return $renderTarget;
}
+
+ /**
+ * @TODO This function is not cool!
+ */
+ function &getThemeRenderTarget($isDialog = false)
+ {
+ $screenTarget = $isDialog ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget();
+ return $screenTarget;
+ }
}
function LegacyRender_smartyfunction_notifications_select($params, &$smarty)
Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.1 Tue Oct 3 18:30:17 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php Thu Oct 5 18:09:58 2006
@@ -289,8 +289,7 @@
function Legacy_get_ovveride_file($file, $prefix = null, $isSpDirname = false)
{
$root =& XCube_Root::getSingleton();
- $modController =& $root->mController->getModuleController();
- $moduleObject =& $modController->getXoopsModule();
+ $moduleObject =& $root->mContext->mXoopsModule;
if ($isSpDirname && is_object($moduleObject) && $moduleObject->get('dirname') == 'base' && isset($_REQUEST['dirname'])) {
if (preg_match("/^[a-z0-9_]+$/i", xoops_getrequest('dirname'))) {