Skip to content

Commit 7503081

Browse files
authored
Merge branch 'develop' into psr12-code-style
2 parents 7c8406b + 9ae0cde commit 7503081

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
1010
### Deprecated
1111
### Removed
1212
### Fixed
13+
- `forward_date` is now correctly saved to the DB.
1314
### Security
1415

1516
## [0.57.0] - 2019-06-01

src/DB.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -881,18 +881,17 @@ public static function insertMessageRequest(Message $message)
881881
}
882882

883883
// Insert the forwarded message user in users table
884-
$forward_date = null;
884+
$forward_date = $message->getForwardDate() ? self::getTimestamp($message->getForwardDate()) : null;
885+
885886
$forward_from = $message->getForwardFrom();
886887
if ($forward_from instanceof User) {
887-
self::insertUser($forward_from, $forward_date);
888+
self::insertUser($forward_from);
888889
$forward_from = $forward_from->getId();
889-
$forward_date = self::getTimestamp($message->getForwardDate());
890890
}
891891
$forward_from_chat = $message->getForwardFromChat();
892892
if ($forward_from_chat instanceof Chat) {
893-
self::insertChat($forward_from_chat, $forward_date);
893+
self::insertChat($forward_from_chat);
894894
$forward_from_chat = $forward_from_chat->getId();
895-
$forward_date = self::getTimestamp($message->getForwardDate());
896895
}
897896

898897
// New and left chat member

0 commit comments

Comments
 (0)