diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-01 20:16:45 +0800 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-08-01 08:16:45 -0400 |
commit | 88f398ffddbcbb58265d085c09cb72008be3f3d5 (patch) | |
tree | 6db22e220a781a144808e113505ce040c7e2eac7 /app/post.go | |
parent | b023b891550cd8fb2f874e822f05921d13f51fb2 (diff) | |
download | chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.gz chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.bz2 chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.zip |
Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes." (#7072)
* Revert "PLT-6603: Don't return all posts on invalid query. (#7061)"
This reverts commit 25a2013890c7e07b4621fa9b18342e7f35363049.
* Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)"
This reverts commit 8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.
Diffstat (limited to 'app/post.go')
-rw-r--r-- | app/post.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/post.go b/app/post.go index ee28fbbf7..055f98373 100644 --- a/app/post.go +++ b/app/post.go @@ -250,8 +250,8 @@ func UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model.AppError return nil, err } - if oldPost.IsSystemMessage() && !oldPost.IsUserActivitySystemMessage() { - err := model.NewAppError("updatePost", "api.post.update_post.system_message.app_error", nil, "id="+post.Id, http.StatusBadRequest) + if oldPost.IsSystemMessage() { + err := model.NewAppError("UpdatePost", "api.post.update_post.system_message.app_error", nil, "id="+post.Id, http.StatusBadRequest) return nil, err } |