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

Aleksander Machniak

2012-10-18 ef790693374bae5851060c1a085a37ebdf1b9b0d

 program/include/rcmail.php

@@ -2102,8 +2102,7 @@

            if (!$storage->connect($host, $user, $pass, $port, $ssl)) {
                if (is_object($this->output)) {
                    $error = $storage->get_error_code() == -1 ? 'storageerror' : 'sessionerror';
                    $this->output->show_message($error, 'error');
                    $this->output->show_message('storageerror', 'error');
                }
            }
            else {