Merge branch 'MDL-27631' of git://github.com/mkassaei/moodle

diff --combined mod/quiz/editlib.php
index 3914e84,a6bc988..9f653c0
--- 1/mod/quiz/editlib.php
--- 2/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@@ -1129,8 -1129,8 +1129,8 @@@ class quiz_question_bank_view extends q
          return new moodle_url('/mod/quiz/edit.php', $params);
      }
  
 -    public function display($tabname, $page, $perpage, $sortorder,
 -            $sortorderdecoded, $cat, $recurse, $showhidden, $showquestiontext) {
 +    public function display($tabname, $page, $perpage, $cat,
 +            $recurse, $showhidden, $showquestiontext) {
          global $OUTPUT;
          if ($this->process_actions_needing_ui()) {
              return;
@@@ -1150,7 -1150,7 +1150,7 @@@
          // continues with list of questions
          $this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname),
                  $this->baseurl, $cat, $this->cm, $recurse, $page,
 -                $perpage, $showhidden, $sortorder, $sortorderdecoded, $showquestiontext,
 +                $perpage, $showhidden, $showquestiontext,
                  $this->contexts->having_cap('moodle/question:add'));
  
          $this->display_options($recurse, $showhidden, $showquestiontext);
@@@ -1183,15 -1183,14 +1183,14 @@@
          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',
+         $this->display_category_form_checkbox('recurse', $recurse,
                  get_string('includesubcategories', 'question'));
-         $this->display_category_form_checkbox('showhidden',
+         $this->display_category_form_checkbox('showhidden', $showhidden,
                  get_string('showhidden', 'question'));
          echo '<noscript><div class="centerpara"><input type="submit" value="' .
                  get_string('go') . '" />';

diff --combined question/editlib.php
index 59811a8,89bba58..52faf97
--- 1/question/editlib.php
--- 2/question/editlib.php
+++ b/question/editlib.php
@@@ -155,6 -155,7 +155,6 @@@ abstract class question_bank_column_bas
  
      /**
       * Output the column header cell.
 -     * @param int $currentsort 0 for none. 1 for normal sort, -1 for reverse sort.
       */
      public function display_header() {
          echo '<th class="header ' . $this->get_classes() . '" scope="col">';
@@@ -1167,8 -1168,8 +1167,8 @@@ class question_bank_view 
       * category      Chooses the category
       * displayoptions Sets display options
       */
 -    public function display($tabname, $page, $perpage, $sortorder,
 -            $sortorderdecoded, $cat, $recurse, $showhidden, $showquestiontext){
 +    public function display($tabname, $page, $perpage, $cat,
 +            $recurse, $showhidden, $showquestiontext) {
          global $PAGE, $OUTPUT;
  
          if ($this->process_actions_needing_ui()) {
@@@ -1190,9 -1191,8 +1190,9 @@@
          $this->print_category_info($category);
  
          // continues with list of questions
 -        $this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname), $this->baseurl, $cat, $this->cm,
 -                $recurse, $page, $perpage, $showhidden, $sortorder, $sortorderdecoded, $showquestiontext,
 +        $this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname),
 +                $this->baseurl, $cat, $this->cm,
 +                $recurse, $page, $perpage, $showhidden, $showquestiontext,
                  $this->contexts->having_cap('moodle/question:add'));
      }
  
@@@ -1246,13 -1246,13 +1246,13 @@@
          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('includesubcategories', 'question'));
-         $this->display_category_form_checkbox('showhidden', get_string('showhidden', 'question'));
-         $this->display_category_form_checkbox('qbshowtext', get_string('showquestiontext', 'question'));
+         $this->display_category_form_checkbox('recurse', $recurse, get_string('includesubcategories', 'question'));
+         $this->display_category_form_checkbox('showhidden', $showhidden, get_string('showhidden', 'question'));
+         $this->display_category_form_checkbox('qbshowtext', $showquestiontext, get_string('showquestiontext', 'question'));
          echo '<noscript><div class="centerpara"><input type="submit" value="'. get_string('go') .'" />';
          echo '</div></noscript></fieldset></form>';
      }
@@@ -1260,10 -1260,10 +1260,10 @@@
      /**
       * 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;" />';
@@@ -1297,6 -1297,7 +1297,6 @@@
      */
      protected function display_question_list($contexts, $pageurl, $categoryandcontext,
              $cm = null, $recurse=1, $page=0, $perpage=100, $showhidden=false,
 -            $sortorder='typename', $sortorderdecoded='qtype, name ASC',
              $showquestiontext = false, $addcontexts = array()) {
          global $CFG, $DB, $OUTPUT;
  
@@@ -1638,12 -1639,17 +1638,12 @@@ function question_edit_setup($edittab, 
          $pagevars['qperpage'] = DEFAULT_QUESTIONS_PER_PAGE;
      }
  
 -    $sortoptions = array('alpha' => 'name, qtype ASC',
 -                          'typealpha' => 'qtype, name ASC',
 -                          'age' => 'id ASC');
 -
 -    if ($sortorder = optional_param('qsortorder', '', PARAM_ALPHA)) {
 -        $pagevars['qsortorderdecoded'] = $sortoptions[$sortorder];
 -        $pagevars['qsortorder'] = $sortorder;
 -        $thispageurl->param('qsortorder', $sortorder);
 -    } else {
 -        $pagevars['qsortorderdecoded'] = $sortoptions['typealpha'];
 -        $pagevars['qsortorder'] = 'typealpha';
 +    for ($i = 1; $i <= question_bank_view::MAX_SORTS; $i++) {
 +        $param = 'qbs' . $i;
 +        if (!$sort = optional_param($param, '', PARAM_ALPHAEXT)) {
 +            break;
 +        }
 +        $thispageurl->param($param, $sort);
      }
  
      $defaultcategory = question_make_default_categories($contexts->all());