From 4d243e9256f86517fc55529372f729568582c03c Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Thu, 17 Aug 2017 12:45:51 -0700 Subject: Fixing bad merge (#7247) --- app/file.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/file.go') 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 } -- cgit v1.2.3-1-g7c22