diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index e4a469064..9c3488511 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1034,7 +1034,7 @@ class memberController extends member } } - self::clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl); $this->setRedirectUrl($returnUrl); } @@ -1266,8 +1266,7 @@ class memberController extends member $this->add('member_srl', $args->member_srl); $this->setMessage('success_updated'); - $site_module_info = Context::get('site_module_info'); - self::clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); $this->setRedirectUrl($returnUrl); @@ -2105,7 +2104,7 @@ class memberController extends member $output = executeQuery('member.deleteMembersGroup', $args); if(!$output->toBool()) return $output; $this->setMessage('success_deleted'); - self::clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl); } /** @@ -2211,7 +2210,7 @@ class memberController extends member $output = executeQuery('member.addMemberToGroup',$args); ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args); - self::clearMemberCache($member_srl, $site_srl); + self::clearMemberCache($member_srl); return $output; } @@ -2251,7 +2250,7 @@ class memberController extends member $output = executeQuery('member.addMemberToGroup', $obj); if(!$output->toBool()) return $output; - self::clearMemberCache($obj->member_srl, $args->site_srl); + self::clearMemberCache($obj->member_srl); } return new BaseObject(); @@ -2465,11 +2464,10 @@ class memberController extends member $args->member_srl = $member_info->member_srl; $output = executeQuery('member.updateLastLogin', $args); - $site_module_info = Context::get('site_module_info'); - self::clearMemberCache($args->member_srl, $site_module_info->site_srl); + self::clearMemberCache($args->member_srl); // Check if there is recoding table. - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); if($oDB->isTableExists('member_count_history') && $config->enable_login_fail_report != 'N') { // check if there is login fail records. @@ -3200,7 +3198,7 @@ class memberController extends member // Remove from cache unset($GLOBALS['__member_info__'][$args->member_srl]); - self::clearMemberCache($args->member_srl, $args->site_srl); + self::clearMemberCache($args->member_srl); $output->add('member_srl', $args->member_srl); return $output; @@ -3943,10 +3941,11 @@ class memberController extends member /** * @deprecated + * @return void */ - public static function _clearMemberCache($member_srl) + public static function _clearMemberCache($member_srl, $site_srl = 0) { - return self::clearMemberCache($member_srl); + self::clearMemberCache($member_srl); } /**