From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 3 Sep 2020 06:35:18 +0000 (+0200)
Subject: Merge pull request #1536 from ArthurHoaro/fix/login-private-shaarli
X-Git-Tag: v0.12.0-beta-1~29
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ca636b898ccd62fbef68048ea29e3f922de7429f;hp=d95624add466d6ee5335e60901c014275134f383;p=github%2Fshaarli%2FShaarli.git

Merge pull request #1536 from ArthurHoaro/fix/login-private-shaarli

Fix login loop for private instances
---

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
             && $this->container->conf->get('privacy.force_login')
             // and the current page isn't already the login page
             // and the user is not requesting a feed (which would lead to a different content-type as expected)
-            && !in_array($next->getName(), ['login', 'atom', 'rss'], true)
+            && !in_array($next->getName(), ['login', 'processLogin', 'atom', 'rss'], true)
         ) {
             throw new UnauthorizedException();
         }