From b1ef4a07284c0546a4bce20e80d825417b1bb7e4 Mon Sep 17 00:00:00 2001
From: Kathrin Osswald <kathrin.osswald@uni-ulm.de>
Date: Fri, 31 May 2019 14:17:39 +0200
Subject: [PATCH] Adjusted columns2.php due to upstream changes in theme Boost.
---
CHANGES.md | 1 +
layout/columns2.php | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 13820b3..09f37c1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
### Unreleased
+* 2019-06-03 - Adjusted columns2.php due to upstream changes in theme Boost.
* 2019-06-03 - Adjusted login.mustache template due to upstream changes in theme Boost.
* 2019-06-03 - Adjusted footer.mustache template due to upstream changes in theme Boost.
* 2019-06-03 - Adjusted columns2.mustache template due to upstream changes in theme Boost.
diff --git a/layout/columns2.php b/layout/columns2.php
index 1285db5..ba51922 100644
--- a/layout/columns2.php
+++ b/layout/columns2.php
@@ -92,9 +92,10 @@ $templatecontext = [
// MODIFICATION END.
];
+$nav = $PAGE->flatnav;
// MODIDFICATION START.
// Use the returned value from theme_boost_campus_get_modified_flatnav_defaulthomepageontop as the template context.
-$templatecontext['flatnavigation'] = theme_boost_campus_process_flatnav($PAGE->flatnav);
+$templatecontext['flatnavigation'] = theme_boost_campus_process_flatnav($nav);
// If setting showsettingsincourse is enabled.
if (get_config('theme_boost_campus', 'showsettingsincourse') == 'yes') {
// Context value for requiring incoursesettings.js.
@@ -104,6 +105,12 @@ if (get_config('theme_boost_campus', 'showsettingsincourse') == 'yes') {
// Add the returned value from theme_boost_campus_get_incourse_activity_settings to the template context.
$templatecontext['activitynode'] = theme_boost_campus_get_incourse_activity_settings();
}
+// MODIFICATION END.
+/* ORIGINAL START.
+$templatecontext['flatnavigation'] = $nav;
+ORIGINAL END. */
+
+$templatecontext['firstcollectionlabel'] = $nav->get_collectionlabel();
// MODIFICATION START: Handle additional layout elements.
// The output buffer is needed to render the additional layout elements now without outputting them to the page directly.
--
GitLab