diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 12:02:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 12:02:54 -0600 |
| commit | 1ae680aefae2deb1e9d07d7c2a1c863ec807a79f (patch) | |
| tree | a99a74d6b858d73624c06f85e393acbe97c90586 /app/admin.go | |
| parent | 9707ac3aaf2cb4352c573aadf54b8535e237dd9e (diff) | |
| parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
| download | chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.gz chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.bz2 chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.zip | |
Merge branch 'master' into release-4.7
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 } } |