From 51fcb01f0a86d148b470571c7e32dd089c9b090b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 11 Aug 2012 10:57:24 +0200
Subject: Added separate From and To columns apart from smart From/To column
 (#1486891)

Conflicts:

	CHANGELOG
	program/steps/mail/check_recent.inc
	program/steps/mail/func.inc
	program/steps/mail/list.inc
	program/steps/mail/mark.inc
	program/steps/mail/move_del.inc
	program/steps/mail/pagenav.inc
	program/steps/mail/search.inc
	skins/larry/mail.css
	skins/larry/templates/mail.html
	skins/larry/ui.js
---
 program/steps/mail/pagenav.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/steps/mail/pagenav.inc')

diff --git a/program/steps/mail/pagenav.inc b/program/steps/mail/pagenav.inc
index 974b3b46f..a1f00b61c 100644
--- a/program/steps/mail/pagenav.inc
+++ b/program/steps/mail/pagenav.inc
@@ -42,7 +42,7 @@ if ($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC'
 }
 else {
     // Only if we use custom sorting
-    $a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']);
+    $a_msg_index = $IMAP->message_index(NULL, rcmail_sort_column(), rcmail_sort_order());
 
     $index = array_search($IMAP->get_id($uid), $a_msg_index);
 
-- 
cgit v1.2.3