summaryrefslogtreecommitdiffstats
path: root/api/api.go
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 16:13:01 -0500
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 16:13:01 -0500
commit32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (patch)
tree5e1653318a6a14bcad80025793adab0f700deed9 /api/api.go
parent62efb1df754bfe6b10a3c17ca6f89fd33b991f56 (diff)
parentc209e4457457edc042f063390c9a222a694f3a6d (diff)
downloadchat-32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c.tar.gz
chat-32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c.tar.bz2
chat-32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c.zip
Merge branch 'release-4.7-revertmaster' into release-4.7
Diffstat (limited to 'api/api.go')
-rw-r--r--api/api.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/api/api.go b/api/api.go
index 70f36db85..2d65bb216 100644
--- a/api/api.go
+++ b/api/api.go
@@ -109,7 +109,7 @@ func Init(a *app.App, root *mux.Router) *API {
api.InitReaction()
// 404 on any api route before web.go has a chance to serve it
- root.Handle("/api/{anything:.*}", http.HandlerFunc(api.Handle404))
+ root.Handle("/api/{anything:.*}", http.HandlerFunc(Handle404))
a.InitEmailBatching()
@@ -120,10 +120,6 @@ func Init(a *app.App, root *mux.Router) *API {
return api
}
-func (api *API) Handle404(w http.ResponseWriter, r *http.Request) {
- Handle404(api.App, w, r)
-}
-
func ReturnStatusOK(w http.ResponseWriter) {
m := make(map[string]string)
m[model.STATUS] = model.STATUS_OK