mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-74321 mod_forum: Forum_check_throttling improvements and fixes

Browse Source 
* Fetch only the fields required by the function.
* Quick validation of the passed forum parameter. If the forum parameter
is an object, it should have the forum ID and the course ID.
* Default return when there's no need to show a warning yet.
This commit is contained in:
Jun Pataleta 2022-03-28 13:08:47 +08:00
parent 0a77eb4ace
commit 86f97c625e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mod/forum/lib.php
View File

@ -5038,11 +5038,16 @@ function forum_check_throttling($forum, $cm = null) {
global $CFG, $DB, $USER;
if (is_numeric($forum)) {
$forum = $DB->get_record('forum', array('id' => $forum), '*', MUST_EXIST);
$forum = $DB->get_record('forum', ['id' => $forum], 'id, course, blockperiod, blockafter, warnafter', MUST_EXIST);
}
if (!is_object($forum)) {
return false; // This is broken.
if (!is_object($forum) || !isset($forum->id) || !isset($forum->course)) {
// The passed forum parameter is invalid. This can happen if:
// - a non-object and non-numeric forum is passed; or
// - the forum object does not have an ID or course attributes.
// This is unlikely to happen with properly formed forum record fetched from the database,
// so it's most likely a dev error if we hit such this case.
throw new coding_exception('Invalid forum parameter passed');
}
if (empty($forum->blockafter)) {
@ -5108,6 +5113,9 @@ function forum_check_throttling($forum, $cm = null) {
return $warning;
}
// No warning needs to be shown yet.
return false;
}
/**