diff --git a/CHANGES.md b/CHANGES.md index 13820b3d988868461a921d7dc6f0e83748dd0129..09f37c15f2762fc14c0b2a97e3d3106045541e32 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 1285db53979afdf611f91a6da6634ff4017b2ff4..ba51922ffa048dc1f7b4727d13faa4cc0765ec7c 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.