NobuNobu
nobun****@users*****
2006年 4月 3日 (月) 14:44:24 JST
Index: xoops2jp/html/modules/base/blocks/legacy_mainmenu.php
diff -u xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.2
--- xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.1 Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_mainmenu.php Mon Apr 3 14:44:24 2006
@@ -1,7 +1,11 @@
<?php
function b_legacy_mainmenu_show() {
- global $xoopsUser,$xoopsModule;
+ $root =& XCube_Root::getSingleton();
+ $xoopsModule =& $root->mController->mModuleController->mModuleObject;
+ $xoopsUser =& $root->mController->mXoopsUser;
+
$block = array();
+
$module_handler =& xoops_gethandler('module');
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
$criteria->add(new Criteria('isactive', 1));
Index: xoops2jp/html/modules/base/blocks/legacy_usermenu.php
diff -u xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.2
--- xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.1 Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_usermenu.php Mon Apr 3 14:44:24 2006
@@ -1,7 +1,9 @@
<?php
function b_legacy_usermenu_show()
{
- global $xoopsUser;
+ $root =& XCube_Root::getSingleton();
+ $xoopsUser =& $root->mController->mXoopsUser;
+
if (is_object($xoopsUser)) {
$pm_handler =& xoops_gethandler('privmessage');
$block = array();