Fix subsection navigation nodes (MDL-82845) WIP 5

Author: james-cnz

classes/global_navigation_wrapper.php

@@ -193,7 +193,8 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
                 || (
                     !$this->innershowemptysections
                     && !$section->hasactivites && !$sectionextra->hassubsections
-                    && ($this->innerincludesectionid !== $section->id)
+                    && ($this->inner->includesectionnum != $section->section)
+                    && ($this->innerincludesectionid != $section->id)
                 )
             ) {
                         // CHANGED ABOVE: Use sanitised visibility, check for subsections, and use section ID.
@@ -239,8 +240,9 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
             }
 
             if (
-                isset($this->innerincludesectionid) && ($this->innerincludesectionid == $section->id)
-                || $sectionextra->hassubsections // TODO: Replace with is_section_in_breadcrumbs?
+                ($this->inner->includesectionnum == $section->section)
+                || ($this->innerincludesectionid == $section->id) // TODO: Replace with is_section_in_breadcrumbs?
+                || $sectionextra->hassubsections
                 // CHANGED ABOVE: Use section ID.
                 // Also check for subsections, because activities might not get loaded otherwise.
             ) {
@@ -260,7 +262,7 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
      *
      * @param navigation_node $sectionnode
      * @param section_info $section
-     * @param stdClass[] $activitiesdata An array of activites as returned by see global_navigation::generate_sections_and_activities()
+     * @param stdClass[] $activitiesdata Array of objects containing activities data indexed by cmid.
      * @return stdClass[] Array of activity nodes
      */
     protected function load_section_activities_navigation(

lib.php

@@ -858,12 +858,12 @@ public function extend_course_navigation($navigation, navigation_node $node) {
         $navigationwrapper = new \format_multitopic\global_navigation_wrapper($navigation, $PAGE); // ADDED.
 
         // If section is specified in course/view.php, make sure it is expanded in navigation.
-        if ($navigationwrapper->innerincludesectionid === null) {
+        if ($navigation->includesectionnum === false) {
             // CHANGED.
             $selectedsectionid = optional_param('sectionid', null, PARAM_INT);
             if (
                 ($selectedsectionid !== null) && (!defined('AJAX_SCRIPT') || (AJAX_SCRIPT == '0'))
-                && $PAGE->url->compare(new moodle_url('/course/view.php'), URL_MATCH_BASE)
+                && ($PAGE->context->contextlevel == CONTEXT_COURSE)
             ) {
                 $navigationwrapper->innerincludesectionid = $selectedsectionid;
             }