From 46d7d3e8c44b155bd1c9687c00d486425a05159c Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 23 Jul 2020 16:52:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20#1363=20=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EB=A9=94=EB=AA=A8=EB=A5=BC=20=EB=B9=88=EA=B0=92=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=82=AD=EC=A0=9C=20=EC=95=88=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.admin.controller.php | 6 ++++++ modules/member/member.controller.php | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index fcf1f3b0f..b1dc82b8f 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -112,6 +112,12 @@ class memberAdminController extends member } } + // 실제로 디비쿼리시 빈값이 없다면 해당 쿼리를 무시하고 업데이트 하기 때문에 메모의 내용이 삭제가 되지 않습니다. + if(!$args->description) + { + $args->description = ''; + } + $oMemberController = getController('member'); // Execute insert or update depending on the value of member_srl if(!$args->member_srl) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 37558a00e..ad655d566 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -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); From d603b6c9660aaa63305fafde40e4c22c0cf235ec Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 23 Jul 2020 16:57:46 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EB=A9=94=EB=AA=A8?= =?UTF-8?q?=EA=B0=80=20=EC=84=B8=ED=8C=85=EB=90=98=EC=97=88=EB=8A=94?= =?UTF-8?q?=EC=A7=80=20=EB=AA=85=ED=99=95=ED=95=98=EA=B2=8C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.admin.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index b1dc82b8f..7ab17a4f0 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -113,7 +113,7 @@ class memberAdminController extends member } // 실제로 디비쿼리시 빈값이 없다면 해당 쿼리를 무시하고 업데이트 하기 때문에 메모의 내용이 삭제가 되지 않습니다. - if(!$args->description) + if(!isset($args->description)) { $args->description = ''; }