From 7de7e02c8dda9c7d9c701ed1ff897fd88ff7b241 Mon Sep 17 00:00:00 2001 From: Alexander Bias <alexander.bias@uni-ulm.de> Date: Sat, 13 Mar 2021 22:01:06 +0100 Subject: [PATCH] Bugfix: Option to output the information banner without any particular Bootstrap color was broken on the login page. --- CHANGES.md | 1 + layout/login.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 035da17..d59dce1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes ### Unreleased +* 2021-03-13 - Bugfix: Option to output the information banner without any particular Bootstrap color was broken on the login page. * 2021-03-13 - Make Behat tests functional again on Github Actions. * 2021-03-13 - Bugfix: Unrestricted self enrolment hint did not respect existing but disabled enrolment instances. diff --git a/layout/login.php b/layout/login.php index eb719b2..d3b9e85 100644 --- a/layout/login.php +++ b/layout/login.php @@ -74,9 +74,7 @@ if ($timedibenable) { $timedibcontent = format_text(get_config('theme_boost_campus', 'timedibcontent'), FORMAT_HTML, $formatoptions); // Result of multiselect is a string divided by a comma, so exploding into an array. $timedibshowonpages = explode(",", get_config('theme_boost_campus', 'timedibshowonpages')); - if ($perpibcss != 'none') { - $timedibcss = get_config('theme_boost_campus', 'timedibcss'); - } + $timedibcss = get_config('theme_boost_campus', 'timedibcss'); $timedibstartsetting = get_config('theme_boost_campus', 'timedibstart'); $timedibendsetting = get_config('theme_boost_campus', 'timedibend'); // Get the current server time. @@ -87,7 +85,9 @@ if ($timedibenable) { // Add the variables to the templatecontext array. $templatecontext['timedibcontent'] = $timedibcontent; - $templatecontext['timedibcss'] = $timedibcss; + if ($timedibcss != 'none') { + $templatecontext['timedibcss'] = $timedibcss; + } $templatecontext['timedinfobannershowonselectedpage'] = $timedinfobannershowonselectedpage; } // MODIFICATION END. -- GitLab