From e28bbd89190ac1e30beac79372e632e707303147 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Mon, 20 Jun 2011 10:26:01 +0100
Subject: [PATCH] MDL-27942 Use picture not displayed during quiz attempts.

---
 mod/quiz/attemptlib.php | 5 +++++
 mod/quiz/renderer.php   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index 2ed1246ac96..cbc118abd87 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -1213,6 +1213,11 @@ abstract class quiz_nav_panel_base {
 
     public function user_picture() {
         global $DB;
+
+        if (!$this->attemptobj->get_quiz()->showuserpicture) {
+            return null;
+        }
+
         $user = $DB->get_record('user', array('id' => $this->attemptobj->get_userid()));
         $userpicture = new user_picture($user);
         $userpicture->courseid = $this->attemptobj->get_courseid();
diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
index e957156bbc7..c4d25dd54de 100644
--- a/mod/quiz/renderer.php
+++ b/mod/quiz/renderer.php
@@ -247,7 +247,7 @@ class mod_quiz_renderer extends plugin_renderer_base {
         }
         $output .= $panel->render_before_button_bits($this);
 
-        $output = html_writer::start_tag('div', array('class' => 'qn_buttons'));
+        $output .= html_writer::start_tag('div', array('class' => 'qn_buttons'));
         foreach ($panel->get_question_buttons() as $button) {
             $output .= $this->render($button);
         }