From fff8a8b242ad0333f877c136c36268d3d4bcae69 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 6 Apr 2023 22:29:02 +0100 Subject: [PATCH] CHANGE: Retain previous date when deleting log data Signed-off-by: Kamil Tekiela --- libraries/classes/Tracking/Tracking.php | 4 +--- test/classes/Tracking/TrackingTest.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/classes/Tracking/Tracking.php b/libraries/classes/Tracking/Tracking.php index 1177b56350..98b8296b97 100644 --- a/libraries/classes/Tracking/Tracking.php +++ b/libraries/classes/Tracking/Tracking.php @@ -799,11 +799,9 @@ class Tracking LogTypeEnum $logType, array $newData, ): bool { - $date = Util::date('Y-m-d H:i:s'); - $newDataProcessed = ''; foreach ($newData as $data) { - $newDataProcessed .= '# log ' . $date . ' ' . $data['username'] . $data['statement'] . "\n"; + $newDataProcessed .= '# log ' . $data['date'] . ' ' . $data['username'] . $data['statement'] . "\n"; } $trackingFeature = $this->relation->getRelationParameters()->trackingFeature; diff --git a/test/classes/Tracking/TrackingTest.php b/test/classes/Tracking/TrackingTest.php index 884e436617..97f2669132 100644 --- a/test/classes/Tracking/TrackingTest.php +++ b/test/classes/Tracking/TrackingTest.php @@ -613,8 +613,8 @@ class TrackingTest extends AbstractTestCase $date = Util::date('Y-m-d H:i:s'); $newData = [ - ['date' => '', 'username' => 'user1', 'statement' => 'test_statement1'], - ['date' => '', 'username' => 'user2', 'statement' => 'test_statement2'], + ['date' => $date, 'username' => 'user1', 'statement' => 'test_statement1'], + ['date' => $date, 'username' => 'user2', 'statement' => 'test_statement2'], ]; $sqlQuery2 = 'UPDATE `pmadb`.`tracking`' .