summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-12-08 08:29:27 -0500
committerJoram Wilander <jwawilander@gmail.com>2015-12-08 08:29:27 -0500
commita686bcc19af3b8a0a89abfb0f85cabeb65005e6e (patch)
tree405d2d4b34e66a21429170dbb31b5a073179918a /utils
parent8cd3e225c995b4e6752262eec36aa5145f28cdea (diff)
parent4d6c8a20eefaaef6fec01962759fc5c1c9dc2e02 (diff)
downloadchat-a686bcc19af3b8a0a89abfb0f85cabeb65005e6e.tar.gz
chat-a686bcc19af3b8a0a89abfb0f85cabeb65005e6e.tar.bz2
chat-a686bcc19af3b8a0a89abfb0f85cabeb65005e6e.zip
Merge pull request #1646 from mattermost/PLT-1302
PLT-1302 fixing hiding email adddress
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go10
1 files changed, 0 insertions, 10 deletions
diff --git a/utils/config.go b/utils/config.go
index 0b292a2ca..93edc0214 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -28,7 +28,6 @@ var CfgDiagnosticId = ""
var CfgLastModified int64 = 0
var CfgFileName string = ""
var ClientCfg map[string]string = map[string]string{}
-var SanitizeOptions map[string]bool = map[string]bool{}
func FindConfigFile(fileName string) string {
if _, err := os.Stat("/tmp/" + fileName); err == nil {
@@ -171,18 +170,9 @@ func LoadConfig(fileName string) {
}
Cfg = &config
- SanitizeOptions = getSanitizeOptions(Cfg)
ClientCfg = getClientConfig(Cfg)
}
-func getSanitizeOptions(c *model.Config) map[string]bool {
- options := map[string]bool{}
- options["fullname"] = c.PrivacySettings.ShowFullName
- options["email"] = c.PrivacySettings.ShowEmailAddress
-
- return options
-}
-
func getClientConfig(c *model.Config) map[string]string {
props := make(map[string]string)