diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
| commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
| tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /api4/user.go | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
| download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api4/user.go')
| -rw-r--r-- | api4/user.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/user.go b/api4/user.go index e13bf9448..897c49ad1 100644 --- a/api4/user.go +++ b/api4/user.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" ) @@ -1177,7 +1177,7 @@ func sendVerificationEmail(c *Context, w http.ResponseWriter, r *http.Request) { err = c.App.SendEmailVerification(user) if err != nil { // Don't want to leak whether the email is valid or not - l4g.Error(err.Error()) + mlog.Error(err.Error()) ReturnStatusOK(w) return } |