NobuNobu
nobun****@users*****
2006年 4月 11日 (火) 17:42:17 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.28 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.29
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.28 Wed Mar 29 23:12:28 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Tue Apr 11 17:42:17 2006
@@ -754,8 +754,6 @@
function setupBlock(&$controller)
{
- require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
-
$showFlag =0;
$mid=0;
@@ -770,14 +768,13 @@
$mid = -1;
}
+ $blockHandler =& xoops_gethandler('block');
$showCenterFlag = (SHOW_CENTERBLOCK_LEFT | SHOW_CENTERBLOCK_CENTER | SHOW_CENTERBLOCK_RIGHT);
$showRightFlag = SHOW_SIDEBLOCK_RIGHT;
$showFlag = SHOW_SIDEBLOCK_LEFT | $showRightFlag | $showCenterFlag;
$groups = is_object($controller->mXoopsUser) ? $controller->mXoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
- $xoopsblock = new XoopsBlock();
- $blockObjects=&$xoopsblock->getBlocks($groups, $mid, $showFlag);
-
+ $blockObjects=&$blockHandler->getBlocks($groups, $mid, $showFlag);
foreach($blockObjects as $blockObject) {
$controller->mBlockChain[]=new XCube_LegacyAdaptBlockProcedure($blockObject);
unset($blockObject);
@@ -851,5 +848,4 @@
}
}
-
?>
\ No newline at end of file