mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-82554-main' of https://github.com/micaherne/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-07-25 08:49:45 +07:00
commit 3edbf5627c
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/questionlib.php
View File

@ -1434,7 +1434,7 @@ function question_has_capability_on($questionorid, $cap, $notused = -1): bool {
} else if (is_object($questionorid)) {
// All we really need in this function is the contextid and author of the question.
// We won't bother fetching other details of the question if these 2 fields are provided.
if (isset($questionorid->contextid) && isset($questionorid->createdby)) {
if (isset($questionorid->contextid) && property_exists($questionorid, 'createdby')) {
$question = $questionorid;
} else if (!empty($questionorid->id)) {
$questionid = $questionorid->id;

29
lib/tests/questionlib_test.php
View File

@ -2024,6 +2024,35 @@ class questionlib_test extends \advanced_testcase {
}
}
/**
* Test that question_has_capability_on does not fail when passed an object with a null
* createdby property.
*/
public function test_question_has_capability_on_object_with_null_createdby(): void {
$this->resetAfterTest();
$generator = $this->getDataGenerator();
$user = $generator->create_user();
$category = $generator->create_category();
$context = \context_coursecat::instance($category->id);
$role = $generator->create_role();
role_assign($role, $user->id, $context->id);
assign_capability('moodle/question:editmine', CAP_ALLOW, $role, $context->id);
$this->setUser($user);
$fakequestion = (object) [
'contextid' => $context->id,
'createdby' => null,
];
$this->assertFalse(question_has_capability_on($fakequestion, 'edit'));
$fakequestion->createdby = $user->id;
$this->assertTrue(question_has_capability_on($fakequestion, 'edit'));
}
/**
* Test of question_categorylist function.
*