fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 17:22:20 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-07-03 16:27:26 +09:00
commit 5047c39bcf
5 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/comment/comment.controller.php
View file

@ -875,6 +875,15 @@ class commentController extends comment
{
return new BaseObject(-1, 'msg_invalid_request');
}
$comment = getModel('comment')->getComment($obj->comment_srl);
if(!$comment->isExists())
{
return new BaseObject(-1, 'msg_not_founded');
}
if(!$is_admin && !$comment->isGranted())
{
return new BaseObject(-1, 'msg_not_permitted');
}
// call a trigger (before)
$output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);

1
modules/comment/lang/en.php
View file

@ -26,6 +26,7 @@ $lang->search_target_list['last_update'] = 'Last update';
$lang->search_target_list['ipaddress'] = 'IP Address';
$lang->search_target_list['is_secret'] = 'Status';
$lang->no_text_comment = 'No text in this comment.';
$lang->no_text_document = 'No text in this document.';
$lang->secret_name_list['Y'] = 'Secret';
$lang->secret_name_list['N'] = 'Public';
$lang->published_name_list[0] = 'Waiting';

1
modules/comment/lang/ko.php
View file

@ -26,6 +26,7 @@ $lang->search_target_list['last_update'] = '최근수정일 ';
$lang->search_target_list['ipaddress'] = 'IP 주소';
$lang->search_target_list['is_secret'] = '상태';
$lang->no_text_comment = '글자가 없는 댓글입니다.';
$lang->no_text_document = '글자가 없는 게시글입니다.';
$lang->secret_name_list['Y'] = '비밀';
$lang->secret_name_list['N'] = '공개';
$lang->published_name_list[0] = '대기';