Minahito
minah****@users*****
2006年 11月 11日 (土) 18:34:44 JST
Index: xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.5 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.5 Mon Nov 6 18:25:19 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php Sat Nov 11 18:34:44 2006
@@ -34,10 +34,10 @@
/**
* @var XCube_RenderTarget
*/
- function &getRenderBuffer()
+ function &getRenderTarget()
{
if (!is_object($this->mRender)) {
- $this->_createRenderBuffer();
+ $this->_createRenderTarget();
}
return $this->mRender;
@@ -58,7 +58,7 @@
* This is a helper function for sub-classes.
* @access protected
*/
- function &_createRenderBuffer()
+ function &_createRenderTarget()
{
$this->mRender =& new XCube_RenderTarget();
$this->mRender->setType(XCUBE_RENDER_TARGET_TYPE_BLOCK);
@@ -232,7 +232,7 @@
return;
}
- $render =& $this->getRenderBuffer();
+ $render =& $this->getRenderTarget();
$render->setAttribute("mid", $this->getId());
if ($this->_mBlock->get('template') == null) {
Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.10 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.11
--- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.10 Thu Nov 9 14:46:39 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php Sat Nov 11 18:34:44 2006
@@ -42,7 +42,7 @@
* [READ ONLY] The render target instance for this module.
* @access public
* @var XCube_RenderTarget
- * @see Legacy_Module::getRenderBuffer()
+ * @see Legacy_Module::getRenderTarget()
*/
var $mRender = null;
@@ -170,12 +170,12 @@
* Gets the render target instance.
* @access public
* @return XCube_RenderTarget
- * @see Legacy_Module::_createRenderBuffer()
+ * @see Legacy_Module::_createRenderTarget()
*/
- function &getRenderBuffer()
+ function &getRenderTarget()
{
if ($this->mRender == null) {
- $this->_createRenderBuffer();
+ $this->_createRenderTarget();
}
return $this->mRender;
@@ -187,9 +187,9 @@
* the instance for many callbacks.
* @access protected
* @return XCube_RenderTarget
- * @see Legacy_Module::getRenderBuffer()
+ * @see Legacy_Module::getRenderTarget()
*/
- function _createRenderBuffer()
+ function _createRenderTarget()
{
$root =& XCube_Root::getSingleton();
$renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.20 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.21
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.20 Fri Nov 10 14:55:59 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php Sat Nov 11 18:34:44 2006
@@ -343,7 +343,7 @@
$renderBuffer = null;
if ($blockProcedure->isDisplay()) {
- $renderBuffer =& $blockProcedure->getRenderBuffer();
+ $renderBuffer =& $blockProcedure->getRenderTarget();
$context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
$context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
@@ -762,7 +762,7 @@
{
if ($this->mRoot->mContext->mModule != null) {
$renderSystem =& $this->mRoot->getRenderSystem($this->mRoot->mContext->mModule->getRenderSystemName());
- $renderTarget =& $this->mRoot->mContext->mModule->getRenderBuffer();
+ $renderTarget =& $this->mRoot->mContext->mModule->getRenderTarget();
//
// Buffering handling of standard output for main render target is responsibility
@@ -785,7 +785,7 @@
ob_end_clean();
if (is_object($renderTarget)) {
- $renderSystem->renderWithTarget($renderTarget);
+ $renderSystem->render($renderTarget);
//
// Cache Control
@@ -826,7 +826,7 @@
//
// Rendering.
//
- $renderSystem->renderWithTarget($screenTarget);
+ $renderSystem->render($screenTarget);
//
// Debug Process