summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-07-13 14:59:00 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-07-13 14:59:00 +0200
commit29723da95bbf59b869a1cf78d53a55c621049f57 (patch)
treeed045dcf065ad50f60f0f03fa4e1ca27232b20d0 /program
parent60eba5df3a22511b4df0df7f0b223ca61424ce89 (diff)
parenteef107be303c8e68bf58641d4245a934d21d0a53 (diff)
Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_imap_generic.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 4cb61e95d..709433041 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -1854,8 +1854,8 @@ class rcube_imap_generic
$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;
}