Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)

Conflicts:
	CHANGELOG
pull/252/head
Aleksander Machniak 10 years ago
parent 34d179a69a
commit 0d6c673546

@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
- Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)
RELEASE 1.0.3
-------------
- Fix insert-signature command in external compose window if opened from inline compose screen (#1490074)

@ -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;
}

Loading…
Cancel
Save