Use multi-level routes for existing controllers instead of 1 level everywhere

[github/shaarli/Shaarli.git] / application / front / ShaarliMiddleware.php

diff --git a/application/front/ShaarliMiddleware.php b/application/front/ShaarliMiddleware.php
index 47aa61bbfb6f9d05f6dff325501d45d3b4b82b81..7ad610c7db4984d6c8b923ac95c56b2351297627 100644 (file)
--- 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;