Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency

This commit is contained in:
2022-02-14 13:40:23 +01:00
82 changed files with 1174 additions and 589 deletions

View File

@@ -1153,11 +1153,8 @@ class AccompanyingPeriod implements
$this->removeComment($this->pinnedComment);
}
if ($comment instanceof Comment) {
if (null !== $this->pinnedComment) {
$this->addComment($this->pinnedComment);
}
$this->addComment($comment);
if (null !== $this->pinnedComment) {
$this->addComment($this->pinnedComment);
}
$this->pinnedComment = $comment;