diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
| commit | 4c683aff7627040ff811f065848a820b2cb19d59 (patch) | |
| tree | 668061e8acfd8827fd02bab18a998b7986944296 /web | |
| parent | eb78d273f39202046fa71555a5a19b0ec8a95cb3 (diff) | |
| parent | 1af1bce6199597bb2d41ddcdc00ef0f28a73c83e (diff) | |
| download | chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.gz chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.bz2 chat-4c683aff7627040ff811f065848a820b2cb19d59.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'web')
| -rw-r--r-- | web/params.go | 2 | ||||
| -rw-r--r-- | web/web.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/web/params.go b/web/params.go index cca306844..2c30ba4c0 100644 --- a/web/params.go +++ b/web/params.go @@ -181,7 +181,7 @@ func ParamsFromRequest(r *http.Request) *Params { params.Page = val } - if val, err := strconv.ParseBool(query.Get("permanent")); err != nil { + if val, err := strconv.ParseBool(query.Get("permanent")); err == nil { params.Permanent = val } diff --git a/web/web.go b/web/web.go index 53276953e..5c1836818 100644 --- a/web/web.go +++ b/web/web.go @@ -30,9 +30,9 @@ func NewWeb(a *app.App, root *mux.Router) *Web { MainRouter: root, } - web.InitStatic() web.InitWebhooks() web.InitSaml() + web.InitStatic() return web } |