From 10cde61958b2b241f745152d661a0bc0040e63d5 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 14 Jul 2017 13:10:20 -0400 Subject: Only apply edit policy setting if message changed (#6930) --- app/post.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/post.go') diff --git a/app/post.go b/app/post.go index f5eb29367..1e8c721ec 100644 --- a/app/post.go +++ b/app/post.go @@ -256,7 +256,7 @@ func UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model.AppError } if utils.IsLicensed { - if *utils.Cfg.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_TIME_LIMIT && model.GetMillis() > oldPost.CreateAt+int64(*utils.Cfg.ServiceSettings.PostEditTimeLimit*1000) { + if *utils.Cfg.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_TIME_LIMIT && model.GetMillis() > oldPost.CreateAt+int64(*utils.Cfg.ServiceSettings.PostEditTimeLimit*1000) && post.Message != oldPost.Message { err := model.NewAppError("UpdatePost", "api.post.update_post.permissions_time_limit.app_error", map[string]interface{}{"timeLimit": *utils.Cfg.ServiceSettings.PostEditTimeLimit}, "", http.StatusBadRequest) return nil, err } -- cgit v1.2.3-1-g7c22 From 70bfcfb9d78f2aa07a36d24b092a477ca2b680ef Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 17 Jul 2017 18:22:28 -0400 Subject: Only apply never edit policy setting when message changes (#6947) --- app/post.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/post.go') diff --git a/app/post.go b/app/post.go index 1e8c721ec..dd0b24bac 100644 --- a/app/post.go +++ b/app/post.go @@ -227,19 +227,19 @@ func SendEphemeralPost(teamId, userId string, post *model.Post) *model.Post { } func UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model.AppError) { - if utils.IsLicensed { - if *utils.Cfg.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_NEVER { - err := model.NewAppError("UpdatePost", "api.post.update_post.permissions_denied.app_error", nil, "", http.StatusForbidden) - return nil, err - } - } - var oldPost *model.Post if result := <-Srv.Store.Post().Get(post.Id); result.Err != nil { return nil, result.Err } else { oldPost = result.Data.(*model.PostList).Posts[post.Id] + if utils.IsLicensed { + if *utils.Cfg.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_NEVER && post.Message != oldPost.Message { + err := model.NewAppError("UpdatePost", "api.post.update_post.permissions_denied.app_error", nil, "", http.StatusForbidden) + return nil, err + } + } + if oldPost == nil { err := model.NewAppError("UpdatePost", "api.post.update_post.find.app_error", nil, "id="+post.Id, http.StatusBadRequest) return nil, err -- cgit v1.2.3-1-g7c22