fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1119 inconsistent point handling when moving comments in and out of Trash

Browse source
This commit is contained in:
Kijin Sung 2018-12-13 11:27:05 +09:00
parent 93284d0787
commit 4158d94606
5 changed files with 56 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/document/document.controller.php
View file

@ -397,6 +397,7 @@ class documentController extends document
if($obj->notify_message != 'Y') $obj->notify_message = 'N';
if(!$obj->email_address) $obj->email_address = '';
if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
$obj->isRestore = $isRestore ? true : false;
// Default Status
if($obj->status)
@ -936,6 +937,7 @@ class documentController extends document
// Call a trigger (before)
$trigger_obj = new stdClass();
$trigger_obj->document_srl = $document_srl;
$trigger_obj->isEmptyTrash = $isEmptyTrash ? true : false;
$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
if(!$output->toBool()) return $output;
@ -992,6 +994,7 @@ class documentController extends document
// Call a trigger (after)
$trigger_obj = $oDocument->getObjectVars();
$trigger_obj->isEmptyTrash = $isEmptyTrash ? true : false;
ModuleHandler::triggerCall('document.deleteDocument', 'after', $trigger_obj);
// declared document, log delete
@ -1153,6 +1156,10 @@ class documentController extends document
}
// Call a trigger (after)
$obj->module_srl = $oDocument->get('module_srl');
$obj->member_srl = $oDocument->get('member_srl');
$obj->regdate = $oDocument->get('regdate');
$obj->last_update = $oDocument->get('last_update');
ModuleHandler::triggerCall('document.moveDocumentToTrash', 'after', $obj);
// commit