From 5c1049054eace710abd3418bbad141fbb7dd5d7f Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 23 May 2017 11:06:25 -0400 Subject: PLT-6471 Properly panic when translations can't be loaded (#6414) * PLT-6471 Properly panic when translations can't be loaded * Print usage messages when errors occur during CLI initialization * Reverted behaviour of FindDir and added second return value to it * Fixed merge conflict --- app/saml.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/saml.go') diff --git a/app/saml.go b/app/saml.go index 8a6e6f16c..730e29efc 100644 --- a/app/saml.go +++ b/app/saml.go @@ -42,7 +42,8 @@ func WriteSamlFile(fileData *multipart.FileHeader) *model.AppError { return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.open.app_error", nil, err.Error()) } - out, err := os.Create(utils.FindDir("config") + filename) + configDir, _ := utils.FindDir("config") + out, err := os.Create(configDir + filename) if err != nil { return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, err.Error()) } -- cgit v1.2.3-1-g7c22