From 29723da95bbf59b869a1cf78d53a55c621049f57 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 13 Jul 2014 08:59:00 -0400
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0
---
CHANGELOG | 1 +
program/lib/Roundcube/rcube_imap_generic.php | 4 ++--
skins/larry/addressbook.css | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 7553b68..e5aa054 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@
- Fix Delete button state after deleting identity/response (#1489972)
- Fix bug where contacts with no email address were listed on compose addressbook (#1489970)
- Fix images import from various vCard formats (#1489977)
+- Fix sorting messages by size on servers without SORT capability (#1489981)
RELEASE 1.0.1
-------------
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 4cb61e9..7094330 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -1854,8 +1854,8 @@
$result[$id] = '';
}
} else if ($mode == 2) {
- if (preg_match('/(UID|RFC822\.SIZE) ([0-9]+)/', $line, $matches)) {
- $result[$id] = trim($matches[2]);
+ if (preg_match('/' . $index_field . ' ([0-9]+)/', $line, $matches)) {
+ $result[$id] = trim($matches[1]);
} else {
$result[$id] = 0;
}
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 54a14da..8171820 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -404,10 +404,11 @@
left: 5px;
top: -3px;
display: inline-block;
- width: 24px;
+ width: 16px;
height: 18px;
text-decoration: none;
text-indent: -5000px;
+ overflow: hidden;
background: url(images/buttons.png) -7px -377px no-repeat;
}
--
Gitblit v1.9.1