* Fix subject/from descending sort regression

* Where the room prefs have given us a sort mode to use in mailbox, actually use it

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 259d9755e08ee926eeb3b84e53821e238fec057c..fd7b4f1abfd6010278a1dabf79209de9563c091f 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -158,7 +158,7 @@ function loadMessages(transport) {
   currentSorterToggle = toggles[sortmode];
   }
   if (!is_safe_mode) {
-  resortAndDisplay(sortRowsByDateDescending);
+  resortAndDisplay(currentSortMode[1]);
   } else {
     setupPageSelector();
     resortAndDisplay(null);
@@ -237,7 +237,7 @@ function sortRowsBySubjectAscending(a, b) {
 function sortRowsBySubjectDescending(a, b) {
   var subjectOne = getTextContent(a.getElementsByTagName("td")[0]).toLowerCase();
   var subjectTwo = getTextContent(b.getElementsByTagName("td")[0]).toLowerCase();
-  return strcmp(subjectOne, subjectTwo);
+  return strcmp(subjectTwo, subjectOne);
 }
 
 function sortRowsByFromAscending(a, b) {
@@ -249,7 +249,7 @@ function sortRowsByFromAscending(a, b) {
 function sortRowsByFromDescending(a, b) {
   var fromOne = getTextContent(a.getElementsByTagName("td")[1]).toLowerCase();
   var fromTwo = getTextContent(b.getElementsByTagName("td")[1]).toLowerCase();
-  return strcmp(fromOne, fromTwo);
+  return strcmp(fromTwo, fromOne);
 }
 
 function CtdlMessageListClick(evt) {