diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
| commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
| tree | 44962a914b86cf66a1da49300f12986db49f010e /api/export.go | |
| parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
| parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
| download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip | |
Fixing merge
Diffstat (limited to 'api/export.go')
| -rw-r--r-- | api/export.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/export.go b/api/export.go index c6bc626f9..aff34073f 100644 --- a/api/export.go +++ b/api/export.go @@ -278,11 +278,11 @@ func copyDirToExportWriter(writer ExportWriter, inPath string, outPath string) * } func ExportLocalStorage(writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { - teamDir := utils.Cfg.ImageSettings.Directory + "teams/" + teamId + teamDir := utils.Cfg.FileSettings.Directory + "teams/" + teamId - if utils.Cfg.ImageSettings.DriverName == model.IMAGE_DRIVER_S3 { + if utils.Cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 { return model.NewAppError("ExportLocalStorage", "S3 is not supported for local storage export.", "") - } else if utils.Cfg.ImageSettings.DriverName == model.IMAGE_DRIVER_LOCAL { + } else if utils.Cfg.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL { if err := copyDirToExportWriter(writer, teamDir, EXPORT_LOCAL_STORAGE_FOLDER); err != nil { return err } |