Merged changes from stable

diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 657be2c1b21f3b21e834f384c59facc0fadd52db..ac2d9b8e56e2b00229b8c8031ad3e430110637ed 100644 (file)
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -482,6 +482,10 @@
 
         $status = true;
 
+        if (!isset($info['#']['ANSWERS'])) {    // No answers in this question (eg random)
+            return $status;
+        }
+
         //Get the answers array
         $answers = $info['#']['ANSWERS']['0']['#']['ANSWER'];