diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-18 15:36:43 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-18 15:36:43 -0700 |
commit | 8e19ba029f889519d93cf272960dce858971106c (patch) | |
tree | d8f38ac62661fb8578e2b5c3c619fe31ab29f480 /app/import.go | |
parent | 34a87fa8f47b1447b73e3ae56866b654801b3eee (diff) | |
download | chat-8e19ba029f889519d93cf272960dce858971106c.tar.gz chat-8e19ba029f889519d93cf272960dce858971106c.tar.bz2 chat-8e19ba029f889519d93cf272960dce858971106c.zip |
Reduce utils.Cfg references (#7650)
* app.UpdateConfig method
* test fix
* another test fix
* the config override option as-was is just error prone, remove it for now
* derp
Diffstat (limited to 'app/import.go')
-rw-r--r-- | app/import.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/import.go b/app/import.go index f7f9cf144..217e924b4 100644 --- a/app/import.go +++ b/app/import.go @@ -558,8 +558,8 @@ func (a *App) ImportUser(data *UserImportData, dryRun bool) *model.AppError { hasUserChanged = true } } else { - if user.Locale != *utils.Cfg.LocalizationSettings.DefaultClientLocale { - user.Locale = *utils.Cfg.LocalizationSettings.DefaultClientLocale + if user.Locale != *a.Config().LocalizationSettings.DefaultClientLocale { + user.Locale = *a.Config().LocalizationSettings.DefaultClientLocale hasUserChanged = true } } |