Change mergeInto return signature; only merge posts if same user

framework/core/src/Core/Models/DiscussionRenamedPost.php

@@ -13,16 +13,21 @@ class DiscussionRenamedPost extends ActivityPost
      * Merge the post into another post of the same type.
      *
      * @param \Flarum\Core\Models\DiscussionRenamedPost $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]) {
+        if ($this->user_id === $previous->user_id) {
-            return false;
+            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 $this;
-        return true;
     }
 
     /**

framework/core/src/Core/Models/MergeableTrait.php

@@ -5,13 +5,13 @@ trait MergeableTrait
     public function saveAfter(Model $previous)
     {
         if ($previous instanceof static) {
-            if ($this->mergeInto($previous)) {
+            if ($merged = $this->mergeInto($previous)) {
-                $previous->save();
+                $merged->save();
+                return $merged;
             } else {
                 $previous->delete();
+                return $previous;
             }
-
-            return $previous;
         }
 
         $this->save();