summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-06-11 13:58:11 +0000
committeralecpl <alec@alec.pl>2009-06-11 13:58:11 +0000
commit59c027ba5fa1042ffd0f62bec97a8127002f2b79 (patch)
treee8fcb1ab24c9bd5bb75f3412a8b3cad83a80083c
parent011b02e75b6fca2a953971fd1bee3135f283b8cb (diff)
- Fix message Etag generation for counter issues (#1485623)
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/show.inc5
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 81f69ed19..7b984652b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix message Etag generation for counter issues (#1485623)
- Fix messages searching on MailEnable IMAP (#1485762)
- Fixed many 'skip_deleted' issues (#1485634)
- Fixed messages list sorting on servers without SORT capability
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 6ab5ba86a..39d2e1a6c 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -50,7 +50,10 @@ if ($_GET['_uid']) {
.intval($MESSAGE->headers->mdn_sent)
.intval($MESSAGE->is_safe)
.(!empty($MESSAGE->attachments) ? intval($CONFIG['inline_images']) : '')
- .intval($PRINT_MODE));
+ .intval($PRINT_MODE)
+ .$_SESSION['sort_col'].$_SESSION['sort_order']
+ .$IMAP->messagecount($mbox_name, 'ALL', true)
+ );
// allow caching, unless remote images are present
if ((bool)$MESSAGE->is_safe)