diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index ae9176faf..be3c3190e 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -292,10 +292,8 @@ class boardController extends board } } // generate document module controller object - $oTrashModel = getModel('trash'); - $config = $oTrashModel->getConfig(); $oDocumentController = getController('document'); - if($config->trash_use == 'Y') + if($this->module_info->trash_use == 'Y') { // move the trash $output = $oDocumentController->moveDocumentToTrash($oDocument); diff --git a/modules/board/lang/ko.php b/modules/board/lang/ko.php index b0c8c3414..be88e8b64 100644 --- a/modules/board/lang/ko.php +++ b/modules/board/lang/ko.php @@ -69,3 +69,5 @@ $lang->msg_admin_update_log = '관리자가 수정한 적이 있는 게시물입 $lang->msg_update_log_revert = '정말로 이 버전으로 되돌리시겠습니까?'; $lang->write_admin = '관리자작성'; $lang->revert_reason_update = '이 버전으로 되돌림'; +$lang->document_force_to_move = '삭제시 휴지통으로 강제이동'; +$lang->about_document_force_to_move = '게시글을 삭제시 휴지통으로 강제이동할지 않할지를 선택하는 옵션입니다.'; diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html index 39a4ab1b3..811ee6f62 100644 --- a/modules/board/tpl/board_insert.html +++ b/modules/board/tpl/board_insert.html @@ -238,6 +238,18 @@
{$lang->msg_warning_update_log}
+{$lang->about_document_force_to_move}
+