Corrected the detection of the Blue Twilight URL to allow redirection to the bootstrapper. Added standard BT to the install page. #146

This commit is contained in:
Andy Heathershaw 2020-04-27 08:32:45 +01:00
parent e06b227147
commit 6ad1cdda8f
2 changed files with 4 additions and 1 deletions

View File

@ -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 */

View File

@ -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