Minahito
minah****@users*****
2005年 12月 30日 (金) 17:26:59 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.9 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.10
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.9 Tue Dec 27 14:29:51 2005
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Fri Dec 30 17:26:59 2005
@@ -177,24 +177,32 @@
foreach($this->mBlockChain as $blockProcedure) {
$blockProcedure->execute($this,$this->getXoopsUser());
if($blockProcedure->hasResult()) {
- //
- //
- //
- $blockTarget->setTemplateName($blockProcedure->getTemplateName());
- $blockTarget->setAttribute("block",$blockProcedure->getResult());
- $blockTarget->setAttribute("mid",$blockProcedure->getId());
+ if ($blockProcedure->getTemplateName() == null) {
+ $this->mRenderSystem->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true;
+ $this->mRenderSystem->mBlockContents[$blockProcedure->getEntryIndex()][] = array(
+ 'title'=>$blockProcedure->getTitle(),
+ 'content'=>$blockProcedure->getResult(),
+ 'weight'=>$blockProcedure->getWeight()
+ );
+ }
+ else {
+ $blockTarget->setTemplateName($blockProcedure->getTemplateName());
+ $blockTarget->setAttribute("block",$blockProcedure->getResult());
+ $blockTarget->setAttribute("mid",$blockProcedure->getId());
+
+ $this->mRenderSystem->renderBlock($blockTarget);
+
+ $this->mRenderSystem->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true;
+ $this->mRenderSystem->mBlockContents[$blockProcedure->getEntryIndex()][] = array(
+ 'title'=>$blockProcedure->getTitle(),
+ 'content'=>$blockTarget->getResult(),
+ 'weight'=>$blockProcedure->getWeight()
+ );
- $this->mRenderSystem->renderBlock($blockTarget);
-
- $this->mRenderSystem->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true;
- $this->mRenderSystem->mBlockContents[$blockProcedure->getEntryIndex()][] = array(
- 'title'=>$blockProcedure->getTitle(),
- 'content'=>$blockTarget->getResult(),
- 'weight'=>$blockProcedure->getWeight()
- );
-
- $blockTarget->reset();
+ $blockTarget->reset();
+ }
}
+
unset($blockProcedure);
}
}
@@ -643,7 +651,7 @@
$xoopsblock = new XoopsBlock();
$blockObjects=&$xoopsblock->getAllByGroupModule($groups, $mid, $showFlag, XOOPS_BLOCK_VISIBLE);
-
+
foreach($blockObjects as $blockObject) {
$controller->mBlockChain[]=new XCube_LegacyAdaptBlockProcedure($blockObject);
unset($blockObject);