diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-22 21:35:29 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-22 21:35:29 -0700 |
| commit | 6a1934192f9e58b73bebdb4cfba555b281c81f13 (patch) | |
| tree | 22f29ee70d3e87ec1cd0cfe50ba8442123105733 /utils/config.go | |
| parent | 5ecf45e109a5910959e0cc6927b826ce5a406a7d (diff) | |
| parent | 7384b0791e54b0fd980ce8c321566c2c42289c02 (diff) | |
| download | chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.gz chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.bz2 chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.zip | |
Merge pull request #1129 from mattermost/PLT-44
PLT-44 Inital support for multi-tab multi-team login
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/config.go b/utils/config.go index 15d6b217c..fd9856a67 100644 --- a/utils/config.go +++ b/utils/config.go @@ -26,7 +26,7 @@ const ( var Cfg *model.Config = &model.Config{} var CfgLastModified int64 = 0 var CfgFileName string = "" -var ClientProperties map[string]string = map[string]string{} +var ClientCfg map[string]string = map[string]string{} var SanitizeOptions map[string]bool = map[string]bool{} func FindConfigFile(fileName string) string { @@ -161,7 +161,7 @@ func LoadConfig(fileName string) { Cfg = &config SanitizeOptions = getSanitizeOptions(Cfg) - ClientProperties = getClientProperties(Cfg) + ClientCfg = getClientConfig(Cfg) } func getSanitizeOptions(c *model.Config) map[string]bool { @@ -172,7 +172,7 @@ func getSanitizeOptions(c *model.Config) map[string]bool { return options } -func getClientProperties(c *model.Config) map[string]string { +func getClientConfig(c *model.Config) map[string]string { props := make(map[string]string) props["Version"] = model.CurrentVersion |