MDL-80098 core: correct arguments for invalidmoduleid exceptions.

The "invalid module ID" should be passed as the `$a` constructor
argument.
This commit is contained in:
Paul Holden
2024-01-17 08:59:01 +00:00
parent 287cfcbe83
commit 88c6878fa6
3 changed files with 10 additions and 2 deletions
+1 -1
View File
@@ -1220,7 +1220,7 @@ function blog_validate_access($courseid, $modid, $groupid, $entryid, $userid) {
throw new \moodle_exception('courseblogdisable', 'blog');
}
if (!$mod = $DB->get_record('course_modules', array('id' => $modid))) {
throw new \moodle_exception('invalidmoduleid', 'error', $modid);
throw new \moodle_exception('invalidmoduleid', 'error', '', $modid);
}
$courseid = $mod->course;
}
+1 -1
View File
@@ -2731,7 +2731,7 @@ function get_course_and_cm_from_instance($instanceorid, $modulename, $courseorid
$modinfo = get_fast_modinfo($course, $userid);
$instances = $modinfo->get_instances_of($modulename);
if (!array_key_exists($instanceid, $instances)) {
throw new moodle_exception('invalidmoduleid', 'error', $instanceid);
throw new moodle_exception('invalidmoduleid', 'error', '', $instanceid);
}
return array($course, $instances[$instanceid]);
}
+8
View File
@@ -895,6 +895,14 @@ class modinfolib_test extends advanced_testcase {
$this->assertInstanceOf('dml_exception', $e);
}
// Invalid module ID.
try {
get_course_and_cm_from_instance(-1, 'page', $course);
$this->fail();
} catch (moodle_exception $e) {
$this->assertStringContainsString('Invalid module ID: -1', $e->getMessage());
}
// Invalid module name.
try {
get_course_and_cm_from_cmid($page->cmid, '1337 h4x0ring');