From 6ad1cdda8feb7c86ccd7614ad2159c87c8955922 Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andysh.uk>
Date: Mon, 27 Apr 2020 08:32:45 +0100
Subject: [PATCH] Corrected the detection of the Blue Twilight URL to allow
 redirection to the bootstrapper. Added standard BT to the install page. #146

---
 public/index.php                         | 4 +++-
 resources/views/install/layout.blade.php | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/index.php b/public/index.php
index 7708cc8..74b1342 100644
--- a/public/index.php
+++ b/public/index.php
@@ -10,7 +10,9 @@
 /* Added by Andy - check to see if Composer/vendors are installed */
 if (!file_exists(__DIR__.'/../vendor/autoload.php'))
 {
-    header('Location: bootstrap/');
+    $currentUrl = $_SERVER['PHP_SELF']; // e.g. /some/directory/index.php
+    $bootstrapUrl = sprintf('%sbootstrap', dirname($currentUrl));
+    header(sprintf('Location: %s', $bootstrapUrl));
     exit();
 }
 /* End Added by Andy */
diff --git a/resources/views/install/layout.blade.php b/resources/views/install/layout.blade.php
index 7a46708..746afd6 100644
--- a/resources/views/install/layout.blade.php
+++ b/resources/views/install/layout.blade.php
@@ -15,6 +15,7 @@
         {{-- As these files are shipped with core (not a theme) use the main app.version instead of the current theme's version --}}
         @if (App::environment() == 'production')
             <link href="css/blue-twilight.min.css?v={{ $app_version_url }}" rel="stylesheet" />
+            <link href="themes/default/theme.css?v={{ $app_version_url }}" rel="stylesheet" />
         @else
             <link href="css/blue-twilight.css?v={{ $app_version_url }}" rel="stylesheet" />
         @endif