diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
| commit | 6f31d90e2f31ae597b83b2f845d5db938af8e38c (patch) | |
| tree | 81c59b83ffb033df92ff7fba5ffaf3ba5fe7a3cf /api4/api.go | |
| parent | 319d61123a0418ea9caa9510b8ad1e9a302c7b93 (diff) | |
| parent | 1f6c271b3bedd6656ae7155714423b1b39a669c1 (diff) | |
| download | chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.gz chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.bz2 chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api4/api.go')
| -rw-r--r-- | api4/api.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/api4/api.go b/api4/api.go index 8c4de4cff..02b884db7 100644 --- a/api4/api.go +++ b/api4/api.go @@ -114,7 +114,7 @@ type API struct { BaseRoutes *Routes } -func Init(a *app.App, root *mux.Router, full bool) *API { +func Init(a *app.App, root *mux.Router) *API { api := &API{ App: a, BaseRoutes: &Routes{}, @@ -234,10 +234,7 @@ func Init(a *app.App, root *mux.Router, full bool) *API { root.Handle("/api/v4/{anything:.*}", http.HandlerFunc(api.Handle404)) - // REMOVE CONDITION WHEN APIv3 REMOVED - if full { - a.InitEmailBatching() - } + a.InitEmailBatching() return api } |