lesson MDL-23525 more bugs fixed to pagetypes.

diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php
index b71bf89..0b9de02 100644 (file)
--- a/mod/lesson/pagetypes/multichoice.php
+++ b/mod/lesson/pagetypes/multichoice.php
@@ -475,6 +475,9 @@ class lesson_display_answer_form_multichoice_singleanswer extends moodleform {
         $contents = $this->_customdata['contents'];
         if (array_key_exists('attempt', $this->_customdata)) {
             $attempt = $this->_customdata['attempt'];
+        } else {
+            $attempt = new stdClass();
+            $attempt->answerid = null;
         }
         $mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
 
@@ -493,7 +496,7 @@ class lesson_display_answer_form_multichoice_singleanswer extends moodleform {
             $mform->addElement('html', '<div class="answeroption">');
             $mform->addElement('radio','answerid',null,format_text($answer->answer, $answer->answerformat, $options),$answer->id);
             $mform->setType('answer'.$i, PARAM_INT);
-            if (isset($USER->modattempts[$lessonid]) && array_key_exists('attempt', $this->_customdata) && $answer->id == $attempt->answerid) {
+            if (isset($USER->modattempts[$lessonid]) && $answer->id == $attempt->answerid) {
                 $mform->setDefault('answerid', true);
             }
             $mform->addElement('html', '</div>');

diff --git a/mod/lesson/pagetypes/truefalse.php b/mod/lesson/pagetypes/truefalse.php
index c68eb48..11e81cc 100644 (file)
--- a/mod/lesson/pagetypes/truefalse.php
+++ b/mod/lesson/pagetypes/truefalse.php
@@ -53,7 +53,7 @@ class lesson_page_type_truefalse extends lesson_page {
         $answers = $this->get_answers();
         shuffle($answers);
 
-        $params = array('answers'=>$answers, 'lessonid'=>$this->lesson->id, 'contents'=>$this->get_contents());
+        $params = array('answers'=>$answers, 'lessonid'=>$this->lesson->id, 'contents'=>$this->get_contents(), 'attempt'=>$attempt);
         $mform = new lesson_display_answer_form_truefalse($CFG->wwwroot.'/mod/lesson/continue.php', $params);
         $data = new stdClass;
         $data->id = $PAGE->cm->id;
@@ -177,7 +177,7 @@ class lesson_page_type_truefalse extends lesson_page {
 
     public function report_answers($answerpage, $answerdata, $useranswer, $pagestats, &$i, &$n) {
         $answers = $this->get_answers();
-        $formattextdefoptions = new obejct(); //I'll use it widely in this page
+        $formattextdefoptions = new object(); //I'll use it widely in this page
         $formattextdefoptions->para = false;
         $formattextdefoptions->noclean = true;
         foreach ($answers as $answer) {
@@ -292,6 +292,12 @@ class lesson_display_answer_form_truefalse extends moodleform {
         $answers = $this->_customdata['answers'];
         $lessonid = $this->_customdata['lessonid'];
         $contents = $this->_customdata['contents'];
+        if (array_key_exists('attempt', $this->_customdata)) {
+            $attempt = $this->_customdata['attempt'];
+        } else {
+            $attempt = new stdClass();
+            $attempt->answerid = null;
+        }
 
         $mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));