fix #1868 임시저장 글을 불러와 등록 시 익명 설정임에도 작성자의 정보가 입력/노출되는 문제 고침

Conflicts:
	modules/board/board.controller.php
	modules/document/document.controller.php
This commit is contained in:
bnu 2016-03-08 16:23:20 +09:00 committed by Kijin Sung
parent 8969514697
commit c7dca3008a
2 changed files with 9 additions and 2 deletions

View file

@ -127,6 +127,11 @@ class boardController extends board
} }
} }
if($this->module_info->use_anonymous == 'Y') {
$obj->member_srl = $oDocument->get('member_srl') * -1;
$oDocument->add('member_srl', $obj->member_srl);
}
if($this->module_info->protect_document_regdate > 0 && $this->grant->manager == false) if($this->module_info->protect_document_regdate > 0 && $this->grant->manager == false)
{ {
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day'))) if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
@ -152,7 +157,7 @@ class boardController extends board
$obj->update_order = $obj->list_order = (getNextSequence() * -1); $obj->update_order = $obj->list_order = (getNextSequence() * -1);
} }
$obj->reason_update = escape($obj->reason_update); $obj->reason_update = escape($obj->reason_update);
$output = $oDocumentController->updateDocument($oDocument, $obj); $output = $oDocumentController->updateDocument($oDocument, $obj, true);
$msg_code = 'success_updated'; $msg_code = 'success_updated';
// insert a new document otherwise // insert a new document otherwise

View file

@ -607,8 +607,9 @@ class documentController extends document
{ {
$obj->password = getModel('member')->hashPassword($obj->password); $obj->password = getModel('member')->hashPassword($obj->password);
} }
// If an author is identical to the modifier or history is used, use the logged-in user's information. // If an author is identical to the modifier or history is used, use the logged-in user's information.
if(Context::get('is_logged') && $module_info->use_anonymous != 'Y') if(Context::get('is_logged') && !$manual_updated && $module_info->use_anonymous != 'Y')
{ {
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($source_obj->get('member_srl')==$logged_info->member_srl) if($source_obj->get('member_srl')==$logged_info->member_srl)
@ -620,6 +621,7 @@ class documentController extends document
$obj->homepage = $logged_info->homepage; $obj->homepage = $logged_info->homepage;
} }
} }
// For the document written by logged-in user however no nick_name exists // For the document written by logged-in user however no nick_name exists
if($source_obj->get('member_srl')&& !$obj->nick_name) if($source_obj->get('member_srl')&& !$obj->nick_name)
{ {