Minahito
minah****@users*****
2006年 10月 11日 (水) 17:13:40 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.11 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.12
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.11 Sun Oct 8 21:15:23 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Wed Oct 11 17:13:40 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: Legacy_Controller.class.php,v 1.1.2.79.2.11 2006/10/08 12:15:23 nobunobu Exp $
+ * @version $Id: Legacy_Controller.class.php,v 1.1.2.79.2.12 2006/10/11 08:13:40 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -83,9 +83,6 @@
*/
var $mGetLanguageName = null;
- var $mBlockShowFlags = array();
- var $mBlockContents = array();
-
/**
* @var XoopsLogger
*/
@@ -273,18 +270,10 @@
// Create render-target for blocks. We use reset() to re-cycle this
// object in the foreach loop.
//
-
- //
- // TODO We should use RenderSystem to create a render-target.
- //
- $renderTarget =& new XCube_RenderTarget();
- $renderTarget->setType(XCUBE_RENDER_TARGET_TYPE_BLOCK);
-
+ $context =& $this->mRoot->mContext;
$cacheInfo =& new Legacy_BlockCacheInformation();
foreach ($this->_mBlockChain as $blockProcedure) {
- $renderTarget->reset();
-
//
// This is a flag indicating whether the controller needs to call
// the logic of the block.
@@ -307,8 +296,8 @@
if ($cacheInfo->isEnableCache() && $this->existActiveCacheFile($filepath, $blockProcedure->getCacheTime())) {
$content = $this->loadCache($filepath);
if ($content != null) {
- $this->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true;
- $this->mBlockContents[$blockProcedure->getEntryIndex()][] = array(
+ $context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
+ $context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
'name' => $blockProcedure->getName(),
'title' => $blockProcedure->getTitle(),
'content' => $content,
@@ -329,8 +318,8 @@
$renderBuffer =& $blockProcedure->getRenderBuffer();
- $this->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true;
- $this->mBlockContents[$blockProcedure->getEntryIndex()][] = array(
+ $context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
+ $context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
'name' => $blockProcedure->getName(),
'title'=>$blockProcedure->getTitle(),
'content'=>$renderBuffer->getResult(),