diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-28 08:48:12 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-28 08:48:12 -0700 |
| commit | 953e27cdf7037a70b9c5b7ba7cd94aab40f17de9 (patch) | |
| tree | f56228231b1877bc09d992620c53cee013e00a26 /api | |
| parent | 46e2e3ebd9180e0ccbfa7335a586215cf9051b4d (diff) | |
| parent | c6f3361d3caf671ca64b798d5ac9eca97c387f9e (diff) | |
| download | chat-953e27cdf7037a70b9c5b7ba7cd94aab40f17de9.tar.gz chat-953e27cdf7037a70b9c5b7ba7cd94aab40f17de9.tar.bz2 chat-953e27cdf7037a70b9c5b7ba7cd94aab40f17de9.zip | |
Merge branch 'master' into PLT-340
Diffstat (limited to 'api')
| -rw-r--r-- | api/user.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/api/user.go b/api/user.go index 3796a50ee..c9958767f 100644 --- a/api/user.go +++ b/api/user.go @@ -652,6 +652,12 @@ func getProfiles(c *Context, w http.ResponseWriter, r *http.Request) { for k, p := range profiles { options := utils.SanitizeOptions options["passwordupdate"] = false + + if c.HasSystemAdminPermissions("getProfiles") { + options["fullname"] = true + options["email"] = true + } + p.Sanitize(options) profiles[k] = p } |