sortorder is now remembered between pages, fixing bug 5328

diff --git a/question/showbank.php b/question/showbank.php
index 867505b21f66d804d72373ca4531f8ea78978cdc..cf23d4a72174daf6a870bec88286369862350b01 100644 (file)
--- a/question/showbank.php
+++ b/question/showbank.php
@@ -25,7 +25,7 @@
 
     $page      = optional_param('page', -1, PARAM_INT);
     $perpage   = optional_param('perpage', 20, PARAM_INT);
-    $sortorder = optional_param('sortorder', 'qtype, name ASC');
+    $sortorder = optional_param('sortorder', '');
     if (preg_match("/[';]/", $sortorder)) {
         error("Incorrect use of the parameter 'sortorder'");
     }
@@ -36,6 +36,12 @@
         $page = isset($SESSION->questionpage) ? $SESSION->questionpage : 0;
     }
 
+    if ($sortorder) {
+        $SESSION->questionsortorder = $sortorder;
+    } else {
+        $sortorder = isset($SESSION->questionsortorder) ? $SESSION->questionsortorder : 'qtype, name ASC';
+    }
+
 /// Now, check for commands on this page and modify variables as necessary
 
     if (isset($_REQUEST['move']) and confirm_sesskey()) { /// Move selected questions to new category