From 4068a67ee82bf513d47506f77e2ece5d6803a768 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 20 Apr 2009 23:21:25 -0600 Subject: [PATCH] Fix setting rownum in output. --- imp/ajax.php | 1 - imp/lib/Views/ListMessages.php | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/imp/ajax.php b/imp/ajax.php index 59ce90c81..8a1a12dcf 100644 --- a/imp/ajax.php +++ b/imp/ajax.php @@ -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) ); diff --git a/imp/lib/Views/ListMessages.php b/imp/lib/Views/ListMessages.php index b39a38a09..525438466 100644 --- a/imp/lib/Views/ListMessages.php +++ b/imp/lib/Views/ListMessages.php @@ -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); -- 2.11.0