From 2fa694fe3df8093123c5e4c816d805a98ab1ccd3 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 7 May 2015 06:39:20 +0930
Subject: [PATCH] Only merge posts if same user

---
 extensions/tags/src/DiscussionMovedPost.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/extensions/tags/src/DiscussionMovedPost.php b/extensions/tags/src/DiscussionMovedPost.php
index a1287f3c0..e57a4914c 100755
--- a/extensions/tags/src/DiscussionMovedPost.php
+++ b/extensions/tags/src/DiscussionMovedPost.php
@@ -16,16 +16,21 @@ class DiscussionMovedPost extends ActivityPost
      * Merge the post into another post of the same type.
      *
      * @param \Flarum\Core\Models\Model $previous
-     * @return boolean true if the post was merged, false if it was deleted.
+     * @return \Flarum\Core\Models\Model|null The final model, or null if the
+     *     previous post was deleted.
      */
     protected function mergeInto(Model $previous)
     {
-        if ($previous->content[0] == $this->content[1]) {
-            return false;
+        if ($this->user_id === $previous->user_id) {
+            if ($previous->content[0] == $this->content[1]) {
+                return;
+            }
+
+            $previous->content = static::buildContent($previous->content[0], $this->content[1]);
+            return $previous;
         }
 
-        $previous->content = static::buildContent($previous->content[0], $this->content[1]);
-        return true;
+        return $this;
     }
 
     /**