diff options
| author | Corey Hulen <corey@hulen.com> | 2017-08-17 12:45:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 12:45:51 -0700 |
| commit | 4d243e9256f86517fc55529372f729568582c03c (patch) | |
| tree | 4f53900191df651ffb691c18ddabde1d137118ce /app/file.go | |
| parent | fd1301779fecc2910a9fdcf93af52ff33a4349ba (diff) | |
| download | chat-4d243e9256f86517fc55529372f729568582c03c.tar.gz chat-4d243e9256f86517fc55529372f729568582c03c.tar.bz2 chat-4d243e9256f86517fc55529372f729568582c03c.zip | |
Fixing bad merge (#7247)
Diffstat (limited to 'app/file.go')
| -rw-r--r-- | app/file.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/file.go b/app/file.go index 2ec6694b4..23e28c9ce 100644 --- a/app/file.go +++ b/app/file.go @@ -117,7 +117,7 @@ func MoveFile(oldPath, newPath string) *model.AppError { signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 region := utils.Cfg.FileSettings.AmazonS3Region encrypt := false - if *utils.Cfg.FileSettings.AmazonS3SSE && utils.IsLicensed && *utils.License.Features.Compliance { + if *utils.Cfg.FileSettings.AmazonS3SSE && utils.IsLicensed() && *utils.License().Features.Compliance { encrypt = true } s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region) @@ -161,7 +161,7 @@ func WriteFile(f []byte, path string) *model.AppError { signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 region := utils.Cfg.FileSettings.AmazonS3Region encrypt := false - if *utils.Cfg.FileSettings.AmazonS3SSE && utils.IsLicensed && *utils.License.Features.Compliance { + if *utils.Cfg.FileSettings.AmazonS3SSE && utils.IsLicensed() && *utils.License().Features.Compliance { encrypt = true } |