diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-09 10:04:48 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 10:04:48 -0600 |
| commit | a6309aaf48e216fe5f6779188071d4b621b643b6 (patch) | |
| tree | 9abbac7f172822e2286c755725fe3533cde8de8a /app/admin.go | |
| parent | 7e8106b95c11a4187f8c00256f3067433d20b24e (diff) | |
| download | chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.gz chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.bz2 chat-a6309aaf48e216fe5f6779188071d4b621b643b6.zip | |
Remove license globals entirely (#8229)
* remove license globals entirely
* fix infinite recursion
* test fix
Diffstat (limited to 'app/admin.go')
| -rw-r--r-- | app/admin.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/admin.go b/app/admin.go index b838ed3bd..154fa8899 100644 --- a/app/admin.go +++ b/app/admin.go @@ -237,7 +237,8 @@ func (a *App) TestEmail(userId string, cfg *model.Config) *model.AppError { return err } else { T := utils.GetUserTranslations(user.Locale) - if err := utils.SendMailUsingConfig(user.Email, T("api.admin.test_email.subject"), T("api.admin.test_email.body"), cfg); err != nil { + license := a.License() + if err := utils.SendMailUsingConfig(user.Email, T("api.admin.test_email.subject"), T("api.admin.test_email.body"), cfg, license != nil && *license.Features.Compliance); err != nil { return err } } |