summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-13 12:19:49 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-13 12:19:49 +0200
commit524e48e99aa7b6f50cba4d32d192124fe2de958c (patch)
treefe2316a564951a5ece66a1d36d7627286d8b29ac /program/include
parentb2e5178b105cfc224715329716bdbdce94976cd3 (diff)
Fix invalid error message on deleting mail from read only folder (#1488694)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 02f38e647..5a9a1fa86 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -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);
}