mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-20 10:52:14 +09:00
Fix #1625 failure to preserve comment with children when parent is moved to trash
This commit is contained in:
parent
0188bb817b
commit
4fe083b3c7
2 changed files with 13 additions and 13 deletions
|
|
@ -1266,7 +1266,15 @@ class commentController extends comment
|
|||
|
||||
if($updateComment !== true)
|
||||
{
|
||||
$output = executeQuery('comment.deleteComment', $trash_args);
|
||||
$args = new stdClass;
|
||||
$args->comment_srl = $obj->comment_srl;
|
||||
$output = executeQuery('comment.deleteComment', $args);
|
||||
if(!$output->toBool())
|
||||
{
|
||||
$oDB->rollback();
|
||||
return $output;
|
||||
}
|
||||
$output = executeQuery('comment.deleteCommentList', $args);
|
||||
if(!$output->toBool())
|
||||
{
|
||||
$oDB->rollback();
|
||||
|
|
@ -1274,10 +1282,6 @@ class commentController extends comment
|
|||
}
|
||||
}
|
||||
|
||||
$args = new stdClass();
|
||||
$args->comment_srl = $obj->comment_srl;
|
||||
$output = executeQuery('comment.deleteCommentList', $args);
|
||||
|
||||
// update the number of comments
|
||||
$comment_count = CommentModel::getCommentCount($obj->document_srl);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue