diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
commit | d3e14a1bf86ac6148e09f888384cb46c61f23cdc (patch) | |
tree | 1c634c90166964f5184cb1ebd20ffb8ed209b120 /app/app.go | |
parent | 60cf74352f13874a7d07c609c03b1c763af19cea (diff) | |
parent | c1853c7f40dd67c49524c8ea884ab61883a6abdd (diff) | |
download | chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.gz chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.bz2 chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/app.go')
-rw-r--r-- | app/app.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/app.go b/app/app.go index b31f67d6b..2cdf333c1 100644 --- a/app/app.go +++ b/app/app.go @@ -560,6 +560,14 @@ func (a *App) DoAdvancedPermissionsMigration() { return } + config := a.Config() + if *config.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_ALWAYS { + *config.ServiceSettings.PostEditTimeLimit = -1 + if err := a.SaveConfig(config, true); err != nil { + mlog.Error("Failed to update config in Advanced Permissions Phase 1 Migration.", mlog.String("error", err.Error())) + } + } + system := model.System{ Name: ADVANCED_PERMISSIONS_MIGRATION_KEY, Value: "true", |