diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-12-08 08:29:27 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-08 08:29:27 -0500 |
| commit | a686bcc19af3b8a0a89abfb0f85cabeb65005e6e (patch) | |
| tree | 405d2d4b34e66a21429170dbb31b5a073179918a /api/user.go | |
| parent | 8cd3e225c995b4e6752262eec36aa5145f28cdea (diff) | |
| parent | 4d6c8a20eefaaef6fec01962759fc5c1c9dc2e02 (diff) | |
| download | chat-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 'api/user.go')
| -rw-r--r-- | api/user.go | 8 |
1 files changed, 4 insertions, 4 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())) |