Merge pull request #677 from Leantime/fixes

fix comment and ticket timezone issues with NOW()
Leantime · Apr 12, 2022 · 46ff3b2 · 46ff3b2
2 parents b819b98 + f2613cb
commit 46ff3b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/domain/comments/repositories/class.comments.php b/src/domain/comments/repositories/class.comments.php
@@ -113,7 +113,7 @@ public function addComment($values, $module)
 
             $sql = "INSERT INTO zp_comment (
 			text, userId, date, moduleId, module, commentParent
-		) VALUES (:text, :userId, NOW(), :moduleId, :module, :commentParent)";
+		) VALUES (:text, :userId, :date, :moduleId, :module, :commentParent)";
 
             $stmn = $this->db->database->prepare($sql);
 
@@ -122,6 +122,7 @@ public function addComment($values, $module)
             $stmn->bindValue(':commentParent', $values['commentParent'], PDO::PARAM_INT);
             $stmn->bindValue(':text', $values['text'], PDO::PARAM_STR);
             $stmn->bindValue(':module', $module, PDO::PARAM_STR);
+            $stmn->bindValue(':date', date("Y-m-d H:i:s"), PDO::PARAM_STR);
 
             $result = $stmn->execute();
             $stmn->closeCursor();

diff --git a/src/domain/tickets/repositories/class.tickets.php b/src/domain/tickets/repositories/class.tickets.php
@@ -1224,7 +1224,7 @@ public function addTicketChange($userId,$ticketId,$values)
             $sql = "INSERT INTO zp_tickethistory (
 					userId, ticketId, changeType, changeValue, dateModified
 				) VALUES (
-					:userId, :ticketId, :changeType, :changeValue, NOW()
+					:userId, :ticketId, :changeType, :changeValue, :date
 				)";
 
             $stmn = $this->db->database->prepare($sql);
@@ -1235,6 +1235,8 @@ public function addTicketChange($userId,$ticketId,$values)
                 $stmn->bindValue(':ticketId', $ticketId, PDO::PARAM_INT);
                 $stmn->bindValue(':changeType', $field, PDO::PARAM_STR);
                 $stmn->bindValue(':changeValue', $value, PDO::PARAM_STR);
+                $stmn->bindValue(':date', date("Y-m-d H:i:s"), PDO::PARAM_STR);
+
                 $stmn->execute();
             }