diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
| commit | 6883f691ef3b33ceee6bc525830675245aaf508a (patch) | |
| tree | 4693838432e0c544944b137ab246fbcc4583d848 /api/user.go | |
| parent | c94883e0dfc0c7cbcf86a78f9134d1e3283a07cd (diff) | |
| parent | 08e02c3dad4d2fa765b11ae58313b3f3e375e447 (diff) | |
| download | chat-6883f691ef3b33ceee6bc525830675245aaf508a.tar.gz chat-6883f691ef3b33ceee6bc525830675245aaf508a.tar.bz2 chat-6883f691ef3b33ceee6bc525830675245aaf508a.zip | |
Merge pull request #1 from mattermost/master
to me
Diffstat (limited to 'api/user.go')
| -rw-r--r-- | api/user.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/user.go b/api/user.go index c0ebc05e0..83e29b28e 100644 --- a/api/user.go +++ b/api/user.go @@ -145,6 +145,10 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) { } func CreateValet(c *Context, team *model.Team) *model.User { + if !utils.Cfg.TeamSettings.AllowValet { + return &model.User{} + } + valet := &model.User{} valet.TeamId = team.Id valet.Email = utils.Cfg.EmailSettings.FeedbackEmail |