From 43b135e5989ca1b9194e3b44e43a2adf8e79f2b6 Mon Sep 17 00:00:00 2001
From: Dan Marsden <dan@danmarsden.com>
Date: Mon, 3 Sep 2012 12:42:26 +1200
Subject: [PATCH] MDL-35156 remove references to non-existant options

---
 grade/grading/form/guide/lib.php     | 6 ++----
 grade/grading/form/guide/preview.php | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/grade/grading/form/guide/lib.php b/grade/grading/form/guide/lib.php
index 1990064071d..9e2c832e8a0 100644
--- a/grade/grading/form/guide/lib.php
+++ b/grade/grading/form/guide/lib.php
@@ -872,10 +872,8 @@ class gradingform_guide_instance extends gradingform_instance {
             $html .= html_writer::tag('div', get_string('restoredfromdraft', 'gradingform_guide'),
                 array('class' => 'gradingform_guide-restored'));
         }
-        if (!empty($options['showdescriptionteacher'])) {
-            $html .= html_writer::tag('div', $this->get_controller()->get_formatted_description(),
-                array('class' => 'gradingform_guide-description'));
-        }
+        $html .= html_writer::tag('div', $this->get_controller()->get_formatted_description(),
+            array('class' => 'gradingform_guide-description'));
         $html .= $this->get_controller()->get_renderer($page)->display_guide($criteria, $comments, $options, $mode,
             $gradingformelement->getName(), $value, $this->validationerrors);
         return $html;
diff --git a/grade/grading/form/guide/preview.php b/grade/grading/form/guide/preview.php
index ba8aa5d56e3..ec2c1e1a64f 100644
--- a/grade/grading/form/guide/preview.php
+++ b/grade/grading/form/guide/preview.php
@@ -49,8 +49,6 @@ $PAGE->set_heading($title);
 
 echo $OUTPUT->header();
 echo $OUTPUT->heading($title);
-if (!empty($options['showdescriptionstudent'])) {
-    echo $OUTPUT->box($controller->get_formatted_description(), 'gradingform_guide-description');
-}
+echo $OUTPUT->box($controller->get_formatted_description(), 'gradingform_guide-description');
 echo $controller->render_preview($PAGE);
 echo $OUTPUT->footer();