Merge branch 'wip-MDL-62742-master' of git://github.com/marinaglancy/moodle

This commit is contained in:
Andrew Nicols
2018-08-29 08:31:08 +08:00
64 changed files with 3890 additions and 3837 deletions
+3 -3
View File
@@ -257,7 +257,7 @@ function question_remove_stale_questions_from_category($categoryid) {
* 2/ Any questions that can't be deleted are moved to a new category
* NOTE: this function is called from lib/db/upgrade.php
*
* @param object|coursecat $category course category object
* @param object|core_course_category $category course category object
*/
function question_category_delete_safe($category) {
global $DB;
@@ -438,8 +438,8 @@ function question_delete_course($course, $feedback=true) {
* 1/ All question categories and their questions are deleted for this course category.
* 2/ All questions are moved to new category
*
* @param object|coursecat $category course category object
* @param object|coursecat $newcategory empty means everything deleted, otherwise id of
* @param object|core_course_category $category course category object
* @param object|core_course_category $newcategory empty means everything deleted, otherwise id of
* category where content moved
* @param boolean $feedback to specify if the process must output a summary of its work
* @return boolean