diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-09-03 08:35:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 08:35:18 +0200 |
| commit | ca636b898ccd62fbef68048ea29e3f922de7429f (patch) | |
| tree | e721c06bef99322c358b2663ec547943c3ff63dc /application | |
| parent | d95624add466d6ee5335e60901c014275134f383 (diff) | |
| parent | 14fcfb521341fd7619cab0301cef699cb42d2080 (diff) | |
| download | Shaarli-ca636b898ccd62fbef68048ea29e3f922de7429f.tar.gz Shaarli-ca636b898ccd62fbef68048ea29e3f922de7429f.tar.zst Shaarli-ca636b898ccd62fbef68048ea29e3f922de7429f.zip | |
Merge pull request #1536 from ArthurHoaro/fix/login-private-shaarli
Fix login loop for private instances
Diffstat (limited to 'application')
| -rw-r--r-- | application/front/ShaarliMiddleware.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/front/ShaarliMiddleware.php b/application/front/ShaarliMiddleware.php index c015c0c6..d1aa1399 100644 --- a/application/front/ShaarliMiddleware.php +++ b/application/front/ShaarliMiddleware.php | |||
| @@ -94,7 +94,7 @@ class ShaarliMiddleware | |||
| 94 | && $this->container->conf->get('privacy.force_login') | 94 | && $this->container->conf->get('privacy.force_login') |
| 95 | // and the current page isn't already the login page | 95 | // and the current page isn't already the login page |
| 96 | // and the user is not requesting a feed (which would lead to a different content-type as expected) | 96 | // and the user is not requesting a feed (which would lead to a different content-type as expected) |
| 97 | && !in_array($next->getName(), ['login', 'atom', 'rss'], true) | 97 | && !in_array($next->getName(), ['login', 'processLogin', 'atom', 'rss'], true) |
| 98 | ) { | 98 | ) { |
| 99 | throw new UnauthorizedException(); | 99 | throw new UnauthorizedException(); |
| 100 | } | 100 | } |