Minahito
minah****@users*****
2006年 10月 5日 (木) 18:11:16 JST
Index: xoops2jp/html/modules/user/preload/Primary/Primary.class.php
diff -u xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.7.2.3 xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.7.2.4
--- xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.7.2.3 Fri Sep 29 17:14:45 2006
+++ xoops2jp/html/modules/user/preload/Primary/Primary.class.php Thu Oct 5 18:11:15 2006
@@ -40,22 +40,22 @@
{
function setupUser(&$principal, &$controller, &$context)
{
- if (is_object($controller->mXoopsUser)) {
+ if (is_object($context->mXoopsUser)) {
return;
}
if (!empty($_SESSION['xoopsUserId'])) {
$memberHandler = xoops_gethandler('member');
$user =& $memberHandler->getUser($_SESSION['xoopsUserId']);
- $controller->mXoopsUser = $user;
- if (!is_object($controller->mXoopsUser)) {
- $controller->mXoopsUser = null;
+ $context->mXoopsUser =& $user;
+ if (!is_object($context->mXoopsUser)) {
+ $context->mXoopsUser = null;
$_SESSION = array();
}
else {
- $controller->mXoopsUser->setGroups($_SESSION['xoopsUserGroups']);
+ $context->mXoopsUser->setGroups($_SESSION['xoopsUserGroups']);
- $identity =& new Legacy_Identity($controller->mXoopsUser);
+ $identity =& new Legacy_Identity($context->mXoopsUser);
$principal = new Legacy_GenericPrincipal($identity, $_SESSION['xoopsUserGroups']);
//