Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-17 8f098e8dead85b6512ac72b2d805314baec72a2f

 program/include/rcmail.php

@@ -1774,10 +1774,7 @@
        $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 @@
                $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);
        }