From ac89fc7120e32c9ba7c2182ca285a4d58e65c08e Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 22 Dec 2023 14:30:23 +0100 Subject: [PATCH] adjust order of css files Signed-off-by: Michael Kaufmann --- lib/init.php | 2 +- templates/Froxlor/config.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/init.php b/lib/init.php index dacd548f..9b1a67b8 100644 --- a/lib/init.php +++ b/lib/init.php @@ -123,7 +123,7 @@ if ($req_host != Settings::Get('system.hostname') && (!empty(Settings::Get('system.froxloraliases')) && !in_array($req_host, array_map('trim', explode(',', Settings::Get('system.froxloraliases'))))) )) { // not the froxlor system-hostname, show info page for domains not configured in froxlor - $redirect_file = FileDir::getUnknownDomainTemplate($req_host); + $redirect_file = FileDir::getUnknownDomainTemplate($req_host ?? "non-detectable http-host"); header('Location: '.$redirect_file); die(); } diff --git a/templates/Froxlor/config.json b/templates/Froxlor/config.json index e6ff2fcd..1c1bcd06 100644 --- a/templates/Froxlor/config.json +++ b/templates/Froxlor/config.json @@ -1,8 +1,8 @@ { "global": { "css": [ - "assets/css/custom.css", - "assets/scss/app.scss" + "assets/scss/app.scss", + "assets/css/custom.css" ], "js": [ "assets/js/app.js",