Merge branch 'hotfix/1.0.3'

[galette.git] / galette / includes / main.inc.php

diff --git a/galette/includes/main.inc.php b/galette/includes/main.inc.php
index 0609aca80fd32614fa7ac91d01f5d4b8b76dd508..c48b63d238f4fb47af8ce1c4723b6a1e2c975630 100644 (file)
--- a/galette/includes/main.inc.php
+++ b/galette/includes/main.inc.php
@@ -117,10 +117,18 @@ $app->add($session);
 require GALETTE_ROOT . '/includes/dependencies.php';
 $app->add($app->getContainer()->get('csrf'));
 
+/**
+ * Authentication middleware
+ */
+$authenticate = new Authenticate($container);
+
+require_once GALETTE_ROOT . 'includes/routes/main.routes.php';
+
 if ($needs_update) {
     $app->add(
         new UpdateAndMaintenance(
             $container->get('i18n'),
+            $container->get(RouteParser::class),
             UpdateAndMaintenance::NEED_UPDATE
         )
     );
@@ -129,11 +137,6 @@ if ($needs_update) {
     die();
 }
 
-/**
- * Authentication middleware
- */
-$authenticate = new Authenticate($container);
-
 //FIXME: remove in 1.1.0; routes/groups should call middleware directly
 $showPublicPages = new \Galette\Middleware\PublicPages($container);
 
@@ -141,7 +144,8 @@ $showPublicPages = new \Galette\Middleware\PublicPages($container);
 if (Galette::MODE_MAINT === GALETTE_MODE && !$container->get('login')->isSuperAdmin()) {
     $app->add(
         new UpdateAndMaintenance(
-            $i18n,
+            $container->get('i18n'),
+            $container->get(RouteParser::class),
             UpdateAndMaintenance::MAINTENANCE
         )
     );
@@ -157,7 +161,6 @@ $app->add(Language::class);
 //Telemetry update middleware
 $app->add(Telemetry::class);
 
-require_once GALETTE_ROOT . 'includes/routes/main.routes.php';
 require_once GALETTE_ROOT . 'includes/routes/authentication.routes.php';
 require_once GALETTE_ROOT . 'includes/routes/management.routes.php';
 require_once GALETTE_ROOT . 'includes/routes/members.routes.php';