Skip to content

Commit

Permalink
fix #2290 관리자가 회원 메모를 삭제할수 없는 문제 수정
Browse files Browse the repository at this point in the history
$args->description은 회원이 관리자가 아닌 경우 unset되므로 별도로 관리자 여부를 체크할 필요 없음
  • Loading branch information
YJSoft committed Aug 29, 2018
1 parent bda8399 commit eda8746
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion modules/member/member.controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -2434,7 +2434,9 @@ function updateMember($args, $is_admin = FALSE)
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;

// BUGFIX 관리자가 회원 메모를 삭제할수 없는 문제 수정 https://github.com/xpressengine/xe-core/issues/2290
if(!isset($args->description)) $args->description = $orgMemberInfo->description;
if(!$args->birthday) $args->birthday = '';

$output = executeQuery('member.updateMember', $args);
Expand Down

0 comments on commit eda8746

Please sign in to comment.