M4.4 fixes.

Lesterhuis-Training-en-Consultancy · May 8, 2024 · 2b478f4 · 2b478f4
1 parent 4c6a6cf
commit 2b478f4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/classes/course_renderer.php b/classes/course_renderer.php
@@ -98,7 +98,7 @@ public function course_section_cm_text_vsf(cm_info $mod, $vsfavailability = fals
                 $availabilityinfo = $this->process_availability($availabilityinfo);
                 $avcontent .= html_writer::start_tag('span', ['class' => 'vsfai', 'title' => $availabilityinfo['text']]);
                 $avcontent .= html_writer::empty_tag('img', ['src' => $this->image_url('access_transparent', 'format_vsf'),
-                    'alt' => '', 'role' => 'presentation']);
+                    'alt' => '']);
                 $avcontent .= html_writer::end_tag('span');
             }
         }
@@ -489,7 +489,12 @@ public function course_section_label_cm_vsf($course, &$completioninfo,
         if ($sectionreturn) {
             $format->set_section_number($sectionreturn);
         }
-        $section = $modinfo->get_section_info($format->get_section_number());
+        $sectionnum = $format->get_sectionnum();
+        if (is_null($sectionnum)) {
+            // Section 0.
+            $sectionnum = 0;
+        }
+        $section = $modinfo->get_section_info($sectionnum);
 
         $cmclass = $format->get_output_classname('content\\cm');
         $cm = new $cmclass($format, $section, $mod, $displayoptions);
@@ -608,7 +613,7 @@ protected function course_section_cm_image(cm_info $mod) {
             $class .= ' custom';
         }
         $image = html_writer::img($srcurl, $mod->get_formatted_name(),
-                ['class' => $class, 'alt' => ' ']);
+                ['class' => $class, 'alt' => '']);
         return html_writer::tag('span',
                 $image, ['class' => 'mdl-align vsf-icon']);
     }

diff --git a/classes/output/courseformat/content/cm/controlmenu.php b/classes/output/courseformat/content/cm/controlmenu.php
@@ -59,7 +59,7 @@ protected function cm_control_items() {
 
         $format = $this->format;
         $mod = $this->mod;
-        $sectionreturn = $format->get_section_number();
+        $sectionreturn = $format->get_sectionnum();
         if (!empty($this->displayoptions['disableindentation']) || !$format->uses_indentation()) {
             $indent = -1;
         } else {

diff --git a/classes/output/courseformat/content/section/cmlist.php b/classes/output/courseformat/content/section/cmlist.php
@@ -55,7 +55,7 @@ public function export_for_template(\renderer_base $output): \stdClass {
 
         // Section information for the 'activitychooserbuttonactivity'.
         $data->num = $this->section->section ?? '0';
-        $data->sectionreturn = $this->format->get_section_number();
+        $data->sectionreturn = $this->format->get_sectionnum();
 
         return $data;
     }

diff --git a/classes/output/renderer.php b/classes/output/renderer.php
@@ -694,7 +694,12 @@ public function single_section_page($course, $displaysection) {
         }
 
         $sectionnavigationclass = $this->courseformat->get_output_classname('content\\sectionnavigation');
-        $sectionnavigation = new $sectionnavigationclass($this->courseformat, $this->courseformat->get_section_number(), $this);
+        $sectionnum = $this->courseformat->get_sectionnum();
+        if (is_null($sectionnum)) {
+            // Section 0.
+            $sectionnum = 0;
+        }
+        $sectionnavigation = new $sectionnavigationclass($this->courseformat, $sectionnum, $this);
         $sectionselectorclass = $this->courseformat->get_output_classname('content\\sectionselector');
         $sectionselector = new $sectionselectorclass($this->courseformat, $sectionnavigation);
         // Do now so that the selection selector export, exports the navigation data.