diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index 9ea8f252c..60c24e022 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -521,8 +521,6 @@ class boardController extends board if($this->module_info->comment_delete_message === 'yes' && $instant_delete != 'Y') { - $comment->content = ''; - $comment->status = 7; $output = $oCommentController->updateCommentByDelete($comment, $this->grant->manager); } elseif(starts_with('only_comm', $this->module_info->comment_delete_message) && $instant_delete != 'Y') @@ -530,8 +528,6 @@ class boardController extends board $childs = $oCommentModel->getChildComments($comment_srl); if(count($childs) > 0) { - $comment->content = ''; - $comment->status = 7; $output = $oCommentController->updateCommentByDelete($comment, $this->grant->manager); } else diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 5dc156e94..40611daf1 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -912,23 +912,29 @@ class commentController extends comment */ function updateCommentByDelete($obj, $is_admin = FALSE) { - $logged_info = Context::get('logged_info'); - + if (!$obj->comment_srl) + { + return new Object(-1, 'msg_invalid_request'); + } + // begin transaction $oDB = DB::getInstance(); $oDB->begin(); // If the case manager to delete comments, it indicated that the administrator deleted. + $logged_info = Context::get('logged_info'); if($is_admin === true && $obj->member_srl !== $logged_info->member_srl) { $obj->content = lang('msg_admin_deleted_comment'); - $obj->status = 8; + $obj->status = RX_STATUS_DELETED_BY_ADMIN; } else { $obj->content = lang('msg_deleted_comment'); + $obj->status = RX_STATUS_DELETED; } $obj->member_srl = 0; + unset($obj->last_update); $output = executeQuery('comment.updateCommentByDelete', $obj); if(!$output->toBool()) { diff --git a/modules/comment/queries/updateCommentByDelete.xml b/modules/comment/queries/updateCommentByDelete.xml index beb8e842e..208ecc397 100644 --- a/modules/comment/queries/updateCommentByDelete.xml +++ b/modules/comment/queries/updateCommentByDelete.xml @@ -3,19 +3,8 @@ - - - - - - - - - - -