From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Tue, 19 Aug 2014 12:08:35 -0400 Subject: [PATCH] Fix merge error that disabled contact drag'n'drop --- program/steps/mail/pagenav.inc | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/program/steps/mail/pagenav.inc b/program/steps/mail/pagenav.inc index e4a4a07..e4b70ad 100644 --- a/program/steps/mail/pagenav.inc +++ b/program/steps/mail/pagenav.inc @@ -17,13 +17,10 @@ +-----------------------------------------------------------------------+ | Author: Aleksander Machniak <alec@alec.pl> | +-----------------------------------------------------------------------+ - - $Id: show.inc 4176 2010-11-04 09:59:55Z alec $ - */ $uid = get_input_value('_uid', RCUBE_INPUT_GET); -$index = $RCMAIL->storage->index(null, $_SESSION['sort_col'], $_SESSION['sort_order']); +$index = $RCMAIL->storage->index(null, rcmail_sort_column(), rcmail_sort_order()); $cnt = $index->count_messages(); if ($cnt && ($pos = $index->exists($uid, true)) !== false) { -- Gitblit v1.9.1