github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-29 12:43:52 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Only merge posts if same user

Browse Source
This commit is contained in:
Toby Zerner 2015-05-07 06:39:20 +09:30
parent 4bf5f91c06
commit 2fa694fe3d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/tags/src/DiscussionMovedPost.php
View File

@ -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;
}
/**