From 3388d2f9f94bb22a7b0f8fc86fe29aa07c7bc12d Mon Sep 17 00:00:00 2001
From: M Kassaei <m.kassaei@open.ac.uk>
Date: Fri, 5 Aug 2011 09:04:48 +0100
Subject: [PATCH] MDL-27631 question bank Show question text in the question
 list when top level category is used

---
 mod/quiz/editlib.php | 14 +++++++++-----
 question/editlib.php | 14 +++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index c93d47143cfcf..6bef160bbde98 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -1118,13 +1118,17 @@ protected function print_category_info($category) {
         echo '</span></div></div>';
     }
 
-    protected function display_options($recurse = 1, $showhidden = false, $showquestiontext = false) {
+    protected function display_options($recurse, $showhidden, $showquestiontext) {
         echo '<form method="get" action="edit.php" id="displayoptions">';
         echo "<fieldset class='invisiblefieldset'>";
-        echo html_writer::input_hidden_params($this->baseurl, array('recurse', 'showhidden', 'showquestiontext'));
-        $this->display_category_form_checkbox('recurse', get_string('recurse', 'quiz'));
-        $this->display_category_form_checkbox('showhidden', get_string('showhidden', 'quiz'));
-        echo '<noscript><div class="centerpara"><input type="submit" value="'. get_string('go')  . '" />';
+        echo html_writer::input_hidden_params($this->baseurl,
+                array('recurse', 'showhidden', 'showquestiontext'));
+        $this->display_category_form_checkbox('recurse', $recurse,
+                get_string('recurse', 'quiz'));
+        $this->display_category_form_checkbox('showhidden', $showhidden,
+                get_string('showhidden', 'quiz'));
+        echo '<noscript><div class="centerpara"><input type="submit" value="' .
+                get_string('go') . '" />';
         echo '</div></noscript></fieldset></form>';
     }
 }
diff --git a/question/editlib.php b/question/editlib.php
index afcfa38873348..5e81c6221c9d8 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1181,13 +1181,13 @@ protected function display_category_form($contexts, $pageurl, $current) {
         echo "</div>\n";
     }
 
-    protected function display_options($recurse = 1, $showhidden = false, $showquestiontext = false) {
+    protected function display_options($recurse, $showhidden, $showquestiontext) {
         echo '<form method="get" action="edit.php" id="displayoptions">';
         echo "<fieldset class='invisiblefieldset'>";
-        echo html_writer::input_hidden_params($this->baseurl, array('recurse', 'showhidden', 'showquestiontext'));
-        $this->display_category_form_checkbox('recurse', get_string('recurse', 'quiz'));
-        $this->display_category_form_checkbox('showhidden', get_string('showhidden', 'quiz'));
-        $this->display_category_form_checkbox('qbshowtext', get_string('showquestiontext', 'quiz'));
+        echo html_writer::input_hidden_params($this->baseurl, array('recurse', 'showhidden', 'qbshowtext'));
+        $this->display_category_form_checkbox('recurse', $recurse, get_string('recurse', 'quiz'));
+        $this->display_category_form_checkbox('showhidden', $showhidden, get_string('showhidden', 'quiz'));
+        $this->display_category_form_checkbox('qbshowtext', $showquestiontext, get_string('showquestiontext', 'quiz'));
         echo '<noscript><div class="centerpara"><input type="submit" value="'. get_string('go') .'" />';
         echo '</div></noscript></fieldset></form>';
     }
@@ -1195,10 +1195,10 @@ protected function display_options($recurse = 1, $showhidden = false, $showquest
     /**
      * Print a single option checkbox. Used by the preceeding.
      */
-    protected function display_category_form_checkbox($name, $label) {
+    protected function display_category_form_checkbox($name, $value, $label) {
         echo '<div><input type="hidden" id="' . $name . '_off" name="' . $name . '" value="0" />';
         echo '<input type="checkbox" id="' . $name . '_on" name="' . $name . '" value="1"';
-        if (optional_param($name, false, PARAM_BOOL)) {
+        if ($value) {
             echo ' checked="checked"';
         }
         echo ' onchange="getElementById(\'displayoptions\').submit(); return true;" />';