X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Ffront%2FShaarliMiddleware.php;h=7ad610c7db4984d6c8b923ac95c56b2351297627;hb=9c75f877935fa6adec951a4d8d32b328aaab314f;hp=47aa61bbfb6f9d05f6dff325501d45d3b4b82b81;hpb=818b3193ffabec57501e3bdfa997206e3c0671ef;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/front/ShaarliMiddleware.php b/application/front/ShaarliMiddleware.php
index 47aa61bb..7ad610c7 100644
--- a/application/front/ShaarliMiddleware.php
+++ b/application/front/ShaarliMiddleware.php
@@ -38,9 +38,9 @@ class ShaarliMiddleware
      */
     public function __invoke(Request $request, Response $response, callable $next)
     {
-        try {
-            $this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
+        $this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
 
+        try {
             $response = $next($request, $response);
         } catch (ShaarliFrontException $e) {
             $this->container->pageBuilder->assign('message', $e->getMessage());
@@ -54,7 +54,7 @@ class ShaarliMiddleware
             $response = $response->withStatus($e->getCode());
             $response = $response->write($this->container->pageBuilder->render('error'));
         } catch (UnauthorizedException $e) {
-            return $response->withRedirect($request->getUri()->getBasePath() . '/login');
+            return $response->withRedirect($this->container->basePath . '/login');
         }
 
         return $response;