Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Fix login loop for private instances
This commit is contained in:
ArthurHoaro 2020-09-03 08:35:18 +02:00 committed by GitHub
commit ca636b898c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/front/ShaarliMiddleware.php
View file

@ -94,7 +94,7 @@ protected function checkOpenShaarli(Request $request, Response $response, callab
&& $this->container->conf->get('privacy.force_login') && $this->container->conf->get('privacy.force_login')
// and the current page isn't already the login page // 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) // 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(); throw new UnauthorizedException();
} }