Fix #1572 Prevent circular references in messages

3 months ago · f3361396b5
1 changed files with 3 additions and 1 deletions
--- a/app/Message.php
+++ b/app/Message.php
@ -441,7 +441,9 @@ class Message extends Model
                $parentMessage = $this->resolveParentMessage($this->jidfrom, (string)$stanza->reply->attributes()->id);

                if (
-                    $parentMessage && $parentMessage->mid != $this->mid
+                    $parentMessage
+                    && $parentMessage->parentmid != $this->mid // prevent circular references
+                    && $parentMessage->mid != $this->mid
                    && $parentMessage->originid != $this->originid
                ) {
                    $this->parentmid = $parentMessage->mid;