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 1/2] 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 c93d47143cf..6bef160bbde 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -1118,13 +1118,17 @@ class quiz_question_bank_view extends question_bank_view {
         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 afcfa388733..5e81c6221c9 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1181,13 +1181,13 @@ class question_bank_view {
         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 @@ class question_bank_view {
     /**
      * 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;" />';

From 1179c92d0b17e09e34123fefc354c6368050784a Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Fri, 26 Aug 2011 17:01:06 +0100
Subject: [PATCH 2/2] MDL-29141 question bank show question text checkbox does
 not match state.

---
 mod/quiz/edit.php    | 2 +-
 mod/quiz/editlib.php | 2 +-
 question/edit.php    | 2 +-
 question/editlib.php | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index db22db5d9e4..c2697950d7d 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -428,7 +428,7 @@ $questionbank->display('editq',
         $pagevars['qpage'],
         $pagevars['qperpage'],
         $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'],
-        $pagevars['showquestiontext']);
+        $pagevars['qbshowtext']);
 echo '</div>';
 echo '</div>';
 echo '</div>';
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 6bef160bbde..b4a2b395cad 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -1122,7 +1122,7 @@ class quiz_question_bank_view extends question_bank_view {
         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'));
+                array('recurse', 'showhidden', 'qbshowtext'));
         $this->display_category_form_checkbox('recurse', $recurse,
                 get_string('recurse', 'quiz'));
         $this->display_category_form_checkbox('showhidden', $showhidden,
diff --git a/question/edit.php b/question/edit.php
index fe948d2894f..6edfad7cfdc 100644
--- a/question/edit.php
+++ b/question/edit.php
@@ -73,7 +73,7 @@
     echo '<div class="questionbankwindow boxwidthwide boxaligncenter">';
     $questionbank->display('questions', $pagevars['qpage'], $pagevars['qperpage'],
             $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'],
-            $pagevars['showquestiontext']);
+            $pagevars['qbshowtext']);
     echo "</div>\n";
 
     echo $OUTPUT->footer();
diff --git a/question/editlib.php b/question/editlib.php
index 5e81c6221c9..860af692e31 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1615,11 +1615,11 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
         $pagevars['showhidden'] = 0;
     }
 
-    if(($showquestiontext = optional_param('showquestiontext', -1, PARAM_BOOL)) != -1) {
-        $pagevars['showquestiontext'] = $showquestiontext;
-        $thispageurl->param('showquestiontext', $showquestiontext);
+    if(($showquestiontext = optional_param('qbshowtext', -1, PARAM_BOOL)) != -1) {
+        $pagevars['qbshowtext'] = $showquestiontext;
+        $thispageurl->param('qbshowtext', $showquestiontext);
     } else {
-        $pagevars['showquestiontext'] = 0;
+        $pagevars['qbshowtext'] = 0;
     }
 
     //category list page