Merge branch 'MDL-67832_37' of https://github.com/timhunt/moodle into…

… MOODLE_37_STABLE (fixed a couple of typos in the merge commit)
moodle · Feb 5, 2020 · 1a75be0 · 1a75be0
2 parents 53c3b1b + 7fda2e9
commit 1a75be0
Show file tree

Hide file tree

Showing 5 changed files with 253 additions and 107 deletions.
diff --git a/lib/questionlib.php b/lib/questionlib.php
@@ -1659,7 +1659,8 @@ protected function generate_context_to_string_array($contexts) {
 /**
  * Check capability on category
  *
- * @param int|stdClass $questionorid object or id. If an object is passed, it should include ->contextid and ->createdby.
+ * @param int|stdClass|question_definition $questionorid object or id.
+ *      If an object is passed, it should include ->contextid and ->createdby.
  * @param string $cap 'add', 'edit', 'view', 'use', 'move' or 'tag'.
  * @param int $notused no longer used.
  * @return bool this user has the capability $cap for this question $question?