summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-11-20 11:57:45 -0600
committerHarrison Healey <harrisonmhealey@gmail.com>2017-11-20 12:57:45 -0500
commit5cf45d21559eb4f8c69f57e9d50bcd4d00b9d430 (patch)
tree87e4513f933e956390dced4c14c766adeac1081f /api
parent7eb75093937076df0d7f95ab85b6d10b40383521 (diff)
downloadchat-5cf45d21559eb4f8c69f57e9d50bcd4d00b9d430.tar.gz
chat-5cf45d21559eb4f8c69f57e9d50bcd4d00b9d430.tar.bz2
chat-5cf45d21559eb4f8c69f57e9d50bcd4d00b9d430.zip
refactor template code (#7860)
Diffstat (limited to 'api')
-rw-r--r--api/api.go3
-rw-r--r--api/user.go2
2 files changed, 1 insertions, 4 deletions
diff --git a/api/api.go b/api/api.go
index 4f593cfa5..44651b1fa 100644
--- a/api/api.go
+++ b/api/api.go
@@ -10,7 +10,6 @@ import (
"github.com/gorilla/mux"
"github.com/mattermost/mattermost-server/app"
"github.com/mattermost/mattermost-server/model"
- "github.com/mattermost/mattermost-server/utils"
_ "github.com/nicksnyder/go-i18n/i18n"
)
@@ -113,8 +112,6 @@ func Init(a *app.App, root *mux.Router) *API {
// 404 on any api route before web.go has a chance to serve it
root.Handle("/api/{anything:.*}", http.HandlerFunc(Handle404))
- utils.InitHTML()
-
a.InitEmailBatching()
if *a.Config().ServiceSettings.EnableAPIv3 {
diff --git a/api/user.go b/api/user.go
index f8cb1d855..5aba61e38 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1040,7 +1040,7 @@ func updateMfa(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
- if err := app.SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil {
+ if err := c.App.SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil {
l4g.Error(err.Error())
}
})