Fix notices from the quiz module on backup and restore. Merged from MOODLE_16_STABLE.

diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 3f225a9c091be1e17a8db53e687111c5da52c87f..c001f2bae0c18bcd74340af54633229ae1f5c012 100644 (file)
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -189,8 +189,12 @@
         $status = true;
 
         //Get the quiz_question_versions array
-        $versions = $info['MOD']['#']['QUESTION_VERSIONS']['0']['#']['QUESTION_VERSION'];
-
+        if (!empty($info['MOD']['#']['QUESTION_VERSIONS'])) {
+            $versions = $info['MOD']['#']['QUESTION_VERSIONS']['0']['#']['QUESTION_VERSION'];
+        } else {
+            $versions = array();
+        }
+        
         //Iterate over question_versions
         for($i = 0; $i < sizeof($versions); $i++) {
             $ver_info = $versions[$i];

diff --git a/question/restorelib.php b/question/restorelib.php
index b9c60454072c3b4c3948b413ab397e97638dd631..a28238fe8b47378fd0a8e31f36e198dcabb30d87 100644 (file)
--- a/question/restorelib.php
+++ b/question/restorelib.php
@@ -114,7 +114,7 @@
             $question_cat->parent = backup_todb($info['QUESTION_CATEGORY']['#']['PARENT']['0']['#']);
             $question_cat->sortorder = backup_todb($info['QUESTION_CATEGORY']['#']['SORTORDER']['0']['#']);
 
-            if ($catfound = restore_get_best_question_category($question_cat, $restore->course)) {
+            if ($catfound = restore_get_best_question_category($question_cat, $restore->course_id)) {
                 $newid = $catfound;
             } else {
                 if (!$question_cat->stamp) {
@@ -165,7 +165,11 @@
         $restored_questions = array();
 
         //Get the questions array
-        $questions = $info['QUESTION_CATEGORY']['#']['QUESTIONS']['0']['#']['QUESTION'];
+        if (!empty($info['QUESTION_CATEGORY']['#']['QUESTIONS'])) {
+            $questions = $info['QUESTION_CATEGORY']['#']['QUESTIONS']['0']['#']['QUESTION'];
+        } else {
+            $questions = array();
+        }
 
         //Iterate over questions
         for($i = 0; $i < sizeof($questions); $i++) {