Merge branch 'stable' into release

lucaboesch · Jun 18, 2024 · 82aa6c8 · 82aa6c8
2 parents 5102a4a + b1105da
commit 82aa6c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/library b/library
diff --git a/mod_form.php b/mod_form.php
@@ -434,15 +434,25 @@ public function get_data() {
     }
 
     public function add_completion_rules() {
+        global $CFG;
+
         $mform   =& $this->_form;
+
+        // Changes for Moodle 4.3 - MDL-78516.
+        if ($CFG->branch < 403) {
+            $suffix = '';
+        } else {
+            $suffix = $this->get_suffix();
+        }
+
         $items   = array();
         $group   = array();
-        $group[] = $mform->createElement('advcheckbox', 'completionpass', null, get_string('completionpass', 'hvp'),
+        $group[] = $mform->createElement('advcheckbox', 'completionpass' . $suffix, null, get_string('completionpass', 'hvp'),
             array('group' => 'cpass'));
-        $mform->disabledIf('completionpass', 'completionusegrade', 'notchecked');
-        $mform->addGroup($group, 'completionpassgroup', get_string('completionpass', 'hvp'), ' &nbsp; ', false);
-        $mform->addHelpButton('completionpassgroup', 'completionpass', 'hvp');
-        $items[] = 'completionpassgroup';
+        $mform->disabledIf('completionpass' . $suffix, 'completionusegrade', 'notchecked');
+        $mform->addGroup($group, 'completionpassgroup' . $suffix, get_string('completionpass', 'hvp'), ' &nbsp; ', false);
+        $mform->addHelpButton('completionpassgroup' . $suffix, 'completionpass', 'hvp');
+        $items[] = 'completionpassgroup' . $suffix;
 
         return $items;
     }

diff --git a/version.php b/version.php
@@ -23,9 +23,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023061200;
+$plugin->version   = 2023122500;
 $plugin->requires  = 2013051403;
 $plugin->cron      = 0;
 $plugin->component = 'mod_hvp';
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->release   = '1.23.2';
+$plugin->release   = '1.26.1';