diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-17 12:24:09 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-17 12:24:09 +0000 |
| commit | 02eece808fde87eac07f8bcbad1ee278cb91514e (patch) | |
| tree | 221a385a7b4d5a01cec3d33543e7a85e6d093db3 /roundcubemail/program/steps/mail/show.inc | |
| parent | 7a2493bf23f7271f5ea4b9e8fd205e13014c5ca6 (diff) | |
Merged devel-threads branch (r3066:3364) back into trunk
git-svn-id: https://svn.roundcube.net/trunk@3367 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/show.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/show.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc index 33e87d5bc..02e1f4824 100644 --- a/roundcubemail/program/steps/mail/show.inc +++ b/roundcubemail/program/steps/mail/show.inc @@ -104,7 +104,7 @@ if ($_GET['_uid']) { $next = $prev = $first = $last = -1; if ($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] != 'DESC' - && empty($_REQUEST['_search']) && !$IMAP->skip_deleted) + && empty($_REQUEST['_search']) && !$CONFIG['skip_deleted'] && !$IMAP->threading) { // this assumes that we are sorted by date_DESC $cnt = $IMAP->messagecount(); @@ -142,7 +142,7 @@ if ($_GET['_uid']) { if (!$MESSAGE->headers->seen) $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid, - 'mailbox' => $IMAP->mailbox, 'message' => $MESSAGE)); + 'mailbox' => $mbox_name, 'message' => $MESSAGE)); } |