Fix setting rownum in output.
authorMichael M Slusarz <slusarz@curecanti.org>
Tue, 21 Apr 2009 05:21:25 +0000 (23:21 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Tue, 21 Apr 2009 05:43:16 +0000 (23:43 -0600)
imp/ajax.php
imp/lib/Views/ListMessages.php

index 59ce90c..8a1a12d 100644 (file)
@@ -79,7 +79,6 @@ function _getListMessages($mbox, $change)
     if (empty($search)) {
         list($slice_start, $slice_end) = explode(':', Util::getPost('slice'), 2);
         $args += array(
-            'slice_rownum' => intval(Util::getPost('rownum')),
             'slice_start' => intval($slice_start),
             'slice_end' => intval($slice_end)
         );
index b39a38a..5254384 100644 (file)
@@ -64,12 +64,11 @@ class IMP_Views_ListMessages
         $result->cacheid = $imp_mailbox->getCacheID();
 
         /* Determine the row slice to process. */
-        if (isset($args['slice_rownum'])) {
-            $rownum = max(1, $args['slice_rownum']);
+        if (isset($args['slice_start'])) {
             $slice_start = $args['slice_start'];
             $slice_end = $args['slice_end'];
         } else {
-            $result->rownum = $rownum = 1;
+            $rownum = 1;
             foreach (array_keys($sorted_list['s'], $args['search_uid']) as $val) {
                 if (empty($sorted_list['m'][$val]) ||
                     ($sorted_list['m'][$val] == $args['search_mbox'])) {
@@ -85,7 +84,10 @@ class IMP_Views_ListMessages
             } elseif ($slice_end > $msgcount) {
                 $slice_start -= $slice_end - $msgcount;
             }
+
+            $result->rownum = $rownum;
         }
+
         $slice_start = max(1, $slice_start);
         $slice_end = min($msgcount, $slice_end);