diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-27 20:15:33 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-27 20:15:33 +0500 |
| commit | 179c4ea684af8d2a021cc6f0042bc4408f39b0bb (patch) | |
| tree | 7789805249e5c962f1175f301beb74272dee30c0 /utils | |
| parent | 68b02ffb9eeb7a414feae8ed89b4011ccecf96bc (diff) | |
| parent | 50eb3d9fe46d6364b6f12201edfe0a401be3ccdd (diff) | |
| download | chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.gz chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.bz2 chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index fd9856a67..6b34c76ed 100644 --- a/utils/config.go +++ b/utils/config.go @@ -159,6 +159,13 @@ func LoadConfig(fileName string) { configureLog(&config.LogSettings) TestConnection(&config) + if config.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL { + dir := config.FileSettings.Directory + if len(dir) > 0 && dir[len(dir)-1:] != "/" { + config.FileSettings.Directory += "/" + } + } + Cfg = &config SanitizeOptions = getSanitizeOptions(Cfg) ClientCfg = getClientConfig(Cfg) |