From 5cfd3480968d7488ebc0fbea0e100022443c378f Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 28 Mar 2024 21:38:38 +0900 Subject: [PATCH] Clean up declared log if prevent_redeclare != "N" #2238 --- modules/comment/comment.admin.controller.php | 9 +++++++++ modules/document/document.admin.controller.php | 10 +++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index 38702809a..c9e2cb875 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -417,6 +417,15 @@ class CommentAdminController extends Comment { return $output; } + + if(Context::get('prevent_redeclare') !== 'Y') + { + $output = executeQuery('comment.deleteDeclaredCommentLog', $args); + if(!$output->toBool()) + { + return $output; + } + } } } diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index c04484ff7..6df5bc780 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -117,10 +117,14 @@ class DocumentAdminController extends Document { return $output; } - $output = executeQuery('document.deleteDocumentDeclaredLog', $args); - if (!$output->toBool()) + + if(Context::get('prevent_redeclare') !== 'Y') { - return $output; + $output = executeQuery('document.deleteDocumentDeclaredLog', $args); + if (!$output->toBool()) + { + return $output; + } } } }