Merge branch '6.0'

[GitHub/WoltLab/com.woltlab.wcf.conversation.git] / files / lib / page / ConversationPage.class.php

diff --git a/files/lib/page/ConversationPage.class.php b/files/lib/page/ConversationPage.class.php
index a5b96cb9a150182343f4d4f195b3f1e38495ef58..2d4e67f7b257ee33dc82d94b4b41de3cc9b123dc 100644 (file)
--- a/files/lib/page/ConversationPage.class.php
+++ b/files/lib/page/ConversationPage.class.php
@@ -210,8 +210,7 @@ class ConversationPage extends MultipleLinkPage
         // update last visit time count
         if (
             $this->conversation->isNew()
-            && (
-                $this->objectList->getMaxPostTime() > $this->conversation->lastVisitTime
+            && ($this->objectList->getMaxPostTime() > $this->conversation->lastVisitTime
                 || ($this->conversation->joinedAt && !\count($this->objectList))
             )
         ) {
@@ -387,6 +386,10 @@ class ConversationPage extends MultipleLinkPage
         $statement = WCF::getDB()->prepareStatement($sql, 1);
         $statement->execute($this->objectList->getConditionBuilder()->getParameters());
         $row = $statement->fetchArray();
+        if ($row === false) {
+            return;
+        }
+
         HeaderUtil::redirect(
             LinkHandler::getInstance()->getLink(
                 'Conversation',