Merge branch '5.4' into 5.5

[GitHub/WoltLab/com.woltlab.wcf.conversation.git] / files / lib / data / conversation / ConversationAction.class.php

diff --git a/files/lib/data/conversation/ConversationAction.class.php b/files/lib/data/conversation/ConversationAction.class.php
index a4a163f9789f58fa913c31116574407be80c8b0a..d21b0fe6ce63d49c80a623ed71eef1ea70f66cb8 100644 (file)
--- a/files/lib/data/conversation/ConversationAction.class.php
+++ b/files/lib/data/conversation/ConversationAction.class.php
@@ -1184,8 +1184,15 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
         $this->conversation->removeParticipant($this->parameters['userID']);
         $this->conversation->updateParticipantSummary();
 
-        ConversationModificationLogHandler::getInstance()
-            ->removeParticipant($this->conversation->getDecoratedObject(), $this->parameters['userID']);
+        $userConversation = Conversation::getUserConversation(
+            $this->conversation->conversationID,
+            $this->parameters['userID']
+        );
+
+        if (!$userConversation->isInvisible) {
+            ConversationModificationLogHandler::getInstance()
+                ->removeParticipant($this->conversation->getDecoratedObject(), $this->parameters['userID']);
+        }
 
         // reset storage
         UserStorageHandler::getInstance()->reset([$this->parameters['userID']], 'unreadConversationCount');