From 0d6c67354682cba082b457618705dd2346ffa861 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 4 Oct 2014 09:56:46 +0200 Subject: Fix setting flags on servers with no PERMANENTFLAGS response (#1490087) Conflicts: CHANGELOG --- program/lib/Roundcube/rcube_imap_generic.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'program') diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index 4809c8b11..2690cbd5a 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -2002,8 +2002,14 @@ class rcube_imap_generic $flag = $this->flags[strtoupper($flag)]; } - if (!$flag || (!in_array($flag, (array) $this->data['PERMANENTFLAGS']) - && !in_array('\\*', (array) $this->data['PERMANENTFLAGS'])) + if (!$flag) { + return false; + } + + // if PERMANENTFLAGS is not specified all flags are allowed + if (!empty($this->data['PERMANENTFLAGS']) + && !in_array($flag, (array) $this->data['PERMANENTFLAGS']) + && !in_array('\\*', (array) $this->data['PERMANENTFLAGS']) ) { return false; } -- cgit v1.2.3