Fix: #2635 - no tree shown on login page

1 files changed, 4 insertions, 0 deletions

diff --git a/app/Http/RequestHandlers/LoginAction.php b/app/Http/RequestHandlers/LoginAction.php
index 9921155862..5eb0b90ab9 100644
--- a/app/Http/RequestHandlers/LoginAction.php
+++ b/app/Http/RequestHandlers/LoginAction.php
@@ -26,9 +26,11 @@ use Fisharebest\Webtrees\FlashMessages;
 use Fisharebest\Webtrees\Http\Controllers\AbstractBaseController;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Log;
+use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\Services\UpgradeService;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\Session;
+use Fisharebest\Webtrees\Tree;
 use Illuminate\Database\Capsule\Manager as DB;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -65,6 +67,7 @@ class LoginAction extends AbstractBaseController
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
+        $tree     = $request->getAttribute('tree');
         $username = $request->getParsedBody()['username'] ?? '';
         $password = $request->getParsedBody()['password'] ?? '';
         $url      = $request->getParsedBody()['url'] ?? '';
@@ -92,6 +95,7 @@ class LoginAction extends AbstractBaseController
         } catch (Exception $ex) {
             // Failed to log in.
             return redirect(route(LoginPage::class, [
+                'tree'     => $tree instanceof Tree ? $tree->name() : null,
                 'username' => $username,
                 'url'      => $url,
                 'error'    => $ex->getMessage(),