aboutsummaryrefslogtreecommitdiff
path: root/server/ui/controller/controller.go
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net> 2017-12-29 14:17:53 -0800
committerGravatar Frédéric Guillot <fred@miniflux.net> 2017-12-29 14:17:53 -0800
commit9eb91e6f0b175a1e96fd252924a52261ee595ba8 (patch)
tree599758d1a6eeb98b0bb8869a59c4dd84589db80b /server/ui/controller/controller.go
parent0f053b07a55c6dad2ec4b6da75995ccfa26bcb4e (diff)
downloadv2-9eb91e6f0b175a1e96fd252924a52261ee595ba8.tar.gz
v2-9eb91e6f0b175a1e96fd252924a52261ee595ba8.tar.zst
v2-9eb91e6f0b175a1e96fd252924a52261ee595ba8.zip
Make sure OAuth2 users cannot be associated multiple times
Diffstat (limited to 'server/ui/controller/controller.go')
-rw-r--r--server/ui/controller/controller.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/server/ui/controller/controller.go b/server/ui/controller/controller.go
index 8a45912b..8555c7b8 100644
--- a/server/ui/controller/controller.go
+++ b/server/ui/controller/controller.go
@@ -44,11 +44,12 @@ func (c *Controller) getCommonTemplateArgs(ctx *core.Context) (tplParams, error)
}
params := tplParams{
- "menu": "",
- "user": user,
- "countUnread": countUnread,
- "csrf": ctx.CSRF(),
- "flashMessage": ctx.FlashMessage(),
+ "menu": "",
+ "user": user,
+ "countUnread": countUnread,
+ "csrf": ctx.CSRF(),
+ "flashMessage": ctx.FlashMessage(),
+ "flashErrorMessage": ctx.FlashErrorMessage(),
}
return params, nil
}