Merge pull request #1646 from mattermost/PLT-1302

PLT-1302 fixing hiding email adddress

4 files changed, 13 insertions, 15 deletions

diff --git a/api/user.go b/api/user.go
index 62947d8fd..886e38c91 100644
--- a/api/user.go
+++ b/api/user.go
@@ -661,7 +661,7 @@ func getProfiles(c *Context, w http.ResponseWriter, r *http.Request) {
 		profiles := result.Data.(map[string]*model.User)
 
 		for k, p := range profiles {
-			options := utils.SanitizeOptions
+			options := utils.Cfg.GetSanitizeOptions()
 			options["passwordupdate"] = false
 
 			if c.IsSystemAdmin() {
@@ -1102,7 +1102,7 @@ func updateRoles(c *Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	options := utils.SanitizeOptions
+	options := utils.Cfg.GetSanitizeOptions()
 	options["passwordupdate"] = false
 	ruser.Sanitize(options)
 	w.Write([]byte(ruser.ToJson()))
@@ -1222,7 +1222,7 @@ func UpdateActive(c *Context, user *model.User, active bool) *model.User {
 		}
 
 		ruser := result.Data.([2]*model.User)[0]
-		options := utils.SanitizeOptions
+		options := utils.Cfg.GetSanitizeOptions()
 		options["passwordupdate"] = false
 		ruser.Sanitize(options)
 		return ruser
@@ -1548,7 +1548,7 @@ func updateUserNotify(c *Context, w http.ResponseWriter, r *http.Request) {
 		c.LogAuditWithUserId(user.Id, "")
 
 		ruser := result.Data.([2]*model.User)[0]
-		options := utils.SanitizeOptions
+		options := utils.Cfg.GetSanitizeOptions()
 		options["passwordupdate"] = false
 		ruser.Sanitize(options)
 		w.Write([]byte(ruser.ToJson()))
diff --git a/model/config.go b/model/config.go
index 195cefae8..869f975e6 100644
--- a/model/config.go
+++ b/model/config.go
@@ -279,3 +279,11 @@ func (o *Config) IsValid() *AppError {
 
 	return nil
 }
+
+func (me *Config) GetSanitizeOptions() map[string]bool {
+	options := map[string]bool{}
+	options["fullname"] = me.PrivacySettings.ShowFullName
+	options["email"] = me.PrivacySettings.ShowEmailAddress
+
+	return options
+}
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index 2cbec705b..728f44bc9 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -592,7 +592,7 @@ func (s SqlChannelStore) GetExtraMembers(channelId string, limit int) StoreChann
 			result.Err = model.NewAppError("SqlChannelStore.GetExtraMembers", "We couldn't get the extra info for channel members", "channel_id="+channelId+", "+err.Error())
 		} else {
 			for i := range members {
-				members[i].Sanitize(utils.SanitizeOptions)
+				members[i].Sanitize(utils.Cfg.GetSanitizeOptions())
 			}
 			result.Data = members
 		}
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)