fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1610 memory leak in initial debug status check

Browse source
This commit is contained in:
Kijin Sung 2021-02-10 00:27:04 +09:00
parent 9c77f9593d
commit f4758b7570
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/debug.php
View file

@ -745,9 +745,9 @@ class Debug
case 'admin':
default:
if (Session::isStarted())
if ($logged_info = \Context::get('logged_info'))
{
return self::$_enabled = Session::isAdmin();
return self::$_enabled = $logged_info->isAdmin();
}
else
{

7
common/framework/helpers/sessionhelper.php
View file

@ -27,8 +27,7 @@ class SessionHelper
$member_srl = intval($member_srl);
if ($member_srl)
{
$oMemberModel = \MemberModel::getInstance();
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
$member_info = \MemberModel::getMemberInfo($member_srl);
if (isset($member_info->member_srl) && intval($member_info->member_srl) === $member_srl)
{
foreach (get_object_vars($member_info) as $key => $value)
@ -36,7 +35,7 @@ class SessionHelper
$this->{$key} = $value;
}
$this->member_srl = $member_srl;
$this->group_list = $oMemberModel->getMemberGroups($member_srl);
$this->group_list = \MemberModel::getMemberGroups($member_srl);
}
}
}
@ -69,7 +68,7 @@ class SessionHelper
*/
public function isModuleAdmin($module_srl = null)
{
return $this->is_admin === 'Y' || \ModuleModel::getInstance()->isModuleAdmin($this, $module_srl);
return $this->is_admin === 'Y' || \ModuleModel::isModuleAdmin($this, $module_srl);
}
/**

4
common/framework/session.php
View file

@ -315,7 +315,7 @@ class Session
{
$current_domain = $site_module_info->domain;
$current_url = URL::getCurrentUrl();
$default_domain = \ModuleModel::getInstance()->getDefaultDomainInfo();
$default_domain = \ModuleModel::getDefaultDomainInfo();
$default_url = \Context::getDefaultUrl($default_domain);
}
@ -700,7 +700,7 @@ class Session
}
// Check member information to see if denied or limited.
$member_info = \MemberModel::getInstance()->getMemberInfoByMemberSrl($member_srl);
$member_info = \MemberModel::getMemberInfo($member_srl);
if ($member_info->denied === 'Y')
{
trigger_error('Session is invalid for member_srl=' . intval($_SESSION['RHYMIX']['login']) . ' (denied)', \E_USER_WARNING);