diff options
| author | Corey Hulen <corey@hulen.com> | 2017-08-16 09:51:45 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-16 09:51:45 -0700 |
| commit | 0ab490845aed0ce3b58cbffd8ec35be237abda1c (patch) | |
| tree | 5310cce7e546f5a03f97245af473b62d382028e8 /app/post.go | |
| parent | 32265df8be5d530f5b79284792afb9451464ad3a (diff) | |
| download | chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.tar.gz chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.tar.bz2 chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.zip | |
PLT-6226 Fixing races with licensing (#7213)
* PLT-6226 Fixing races with licensing
* Fixing build issue
* Fixing licensing issue
* removing commented code
Diffstat (limited to 'app/post.go')
| -rw-r--r-- | app/post.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/post.go b/app/post.go index a4b177859..068266120 100644 --- a/app/post.go +++ b/app/post.go @@ -233,7 +233,7 @@ func UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model.AppError } else { oldPost = result.Data.(*model.PostList).Posts[post.Id] - if utils.IsLicensed { + 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 @@ -255,7 +255,7 @@ func UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model.AppError return nil, err } - if utils.IsLicensed { + if utils.IsLicensed() { 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 @@ -503,7 +503,7 @@ func SearchPostsInTeam(terms string, userId string, teamId string, isOrSearch bo paramsList := model.ParseSearchParams(terms) esInterface := einterfaces.GetElasticsearchInterface() - if esInterface != nil && *utils.Cfg.ElasticsearchSettings.EnableSearching && utils.IsLicensed && *utils.License.Features.Elasticsearch { + if esInterface != nil && *utils.Cfg.ElasticsearchSettings.EnableSearching && utils.IsLicensed() && *utils.License().Features.Elasticsearch { finalParamsList := []*model.SearchParams{} for _, params := range paramsList { |