NobuNobu
nobun****@users*****
2006年 2月 6日 (月) 00:56:36 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.22 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.23
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.22 Fri Jan 27 23:49:57 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Mon Feb 6 00:56:36 2006
@@ -712,19 +712,12 @@
}
$showCenterFlag = (SHOW_CENTERBLOCK_LEFT | SHOW_CENTERBLOCK_CENTER | SHOW_CENTERBLOCK_RIGHT);
- if (isset($_GLOBALS['xoopsOption']['show_cblock']) && !$_GLOBALS['xoopsOption']['show_cblock'])
- $showCenterFlag = 0;
-
$showRightFlag = SHOW_SIDEBLOCK_RIGHT;
- if (isset($_GLOBALS['xoopsOption']['show_rblock']) && !$_GLOBALS['xoopsOption']['show_rblock'])
- $showRightFlag = 0;
-
$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, SHOW_SIDEBLOCK_LEFT | SHOW_SIDEBLOCK_RIGHT);
+ $blockObjects=&$xoopsblock->getBlocks($groups, $mid, $showFlag);
foreach($blockObjects as $blockObject) {
$controller->mBlockChain[]=new XCube_LegacyAdaptBlockProcedure($blockObject);