diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
| commit | 4c683aff7627040ff811f065848a820b2cb19d59 (patch) | |
| tree | 668061e8acfd8827fd02bab18a998b7986944296 /api4/team.go | |
| parent | eb78d273f39202046fa71555a5a19b0ec8a95cb3 (diff) | |
| parent | 1af1bce6199597bb2d41ddcdc00ef0f28a73c83e (diff) | |
| download | chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.gz chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.bz2 chat-4c683aff7627040ff811f065848a820b2cb19d59.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api4/team.go')
| -rw-r--r-- | api4/team.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api4/team.go b/api4/team.go index 1c2e9514e..508602d0e 100644 --- a/api4/team.go +++ b/api4/team.go @@ -198,7 +198,7 @@ func deleteTeam(c *Context, w http.ResponseWriter, r *http.Request) { } var err *model.AppError - if c.Params.Permanent { + if c.Params.Permanent && *c.App.Config().ServiceSettings.EnableAPITeamDeletion { err = c.App.PermanentDeleteTeamId(c.Params.TeamId) } else { err = c.App.SoftDeleteTeam(c.Params.TeamId) |