fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1365 from bjrambo/pr/delete-memo

Browse source 
Fix #1363 회원 메모를 빈값으로 삭제 안되는 문제 고침
This commit is contained in:
Kijin Sung 2020-07-23 20:20:05 +09:00 • committed by GitHub
commit e2fa95e16c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/member/member.admin.controller.php
View file

@ -112,6 +112,12 @@ class memberAdminController extends member
}
}
// 실제로 디비쿼리시 빈값이 없다면 해당 쿼리를 무시하고 업데이트 하기 때문에 메모의 내용이 삭제가 되지 않습니다.
if(!isset($args->description))
{
$args->description = '';
}
$oMemberController = getController('member');
// Execute insert or update depending on the value of member_srl
if(!$args->member_srl)

11
modules/member/member.controller.php
View file

@ -591,7 +591,7 @@ class memberController extends member
throw new Rhymix\Framework\Exceptions\SecurityViolation;
}
$oMemberModel = &getModel ('member');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
// call a trigger (before)
@ -2764,8 +2764,12 @@ class memberController extends member
else
{
unset($args->is_admin);
unset($args->limit_date);
unset($args->description);
if($is_admin == false)
{
unset($args->denied);
}
if($logged_info->member_srl != $args->member_srl && $is_admin == false)
{
return new BaseObject(-1, 'msg_invalid_request');
@ -2966,7 +2970,10 @@ class memberController extends member
if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
if(!$args->description) $args->description = $orgMemberInfo->description;
if($logged_info->is_admin !== 'Y')
{
$args->description = $orgMemberInfo->description;
}
if(!$args->birthday) $args->birthday = $orgMemberInfo->birthday;
$output = executeQuery('member.updateMember', $args);