Fix invalid error message on deleting mail from read only folder (#1488694)

pull/29/merge
Aleksander Machniak 12 years ago
parent b2e5178b10
commit 524e48e99a

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Fix invalid error message on deleting mail from read only folder (#1488694)
- Fix error where session wasn't updated after folder rename/delete (#1488692)
- Replace data URIs of images (pasted in HTML editor) with inline attachments (#1488502)
- Fix PLAIN authentication for some IMAP servers (#1488674)

@ -1774,10 +1774,7 @@ class rcmail extends rcube
$err_code = $this->storage->get_error_code();
$res_code = $this->storage->get_response_code();
if ($err_code < 0) {
$this->output->show_message('storageerror', 'error');
}
else if ($res_code == rcube_storage::NOPERM) {
if ($res_code == rcube_storage::NOPERM) {
$this->output->show_message('errornoperm', 'error');
}
else if ($res_code == rcube_storage::READONLY) {
@ -1792,6 +1789,9 @@ class rcmail extends rcube
$this->output->show_message('servererrormsg', 'error', array('msg' => $err_str));
}
}
else if ($err_code < 0) {
$this->output->show_message('storageerror', 'error');
}
else if ($fallback) {
$this->output->show_message($fallback, 'error', $fallback_args);
}

Loading…
Cancel
Save