Merge branch 'MDL-28976' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 10:57:16 +0000 (12:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 10:57:16 +0000 (12:57 +0200)
1  2 
mod/quiz/renderer.php

diff --combined mod/quiz/renderer.php
@@@ -417,8 -417,8 +417,8 @@@ class mod_quiz_renderer extends plugin_
  
          // Print all the questions
          foreach ($slots as $slot) {
-             $output .= $attemptobj->render_question($slot, false, $attemptobj->attempt_url($id,
-                     $page));
+             $output .= $attemptobj->render_question($slot, false,
+                     $attemptobj->attempt_url($slot, $page));
          }
  
          $output .= html_writer::start_tag('div', array('class' => 'submitbtns'));
              }
              $row[] = $datecompleted;
  
 -            if ($viewobj->markcolumn && $attempt->timefinish > 0) {
 -                if ($attemptoptions->marks >= question_display_options::MARK_AND_MAX) {
 +            if ($viewobj->markcolumn) {
 +                if ($attemptoptions->marks >= question_display_options::MARK_AND_MAX &&
 +                        $attempt->timefinish > 0) {
                      $row[] = quiz_format_grade($quiz, $attempt->sumgrades);
                  } else {
                      $row[] = '';