From ef790693374bae5851060c1a085a37ebdf1b9b0d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 18 Oct 2012 08:24:49 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/include/rcmail.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 0c2bf64..7a49095 100644
--- a/program/include/rcmail.php
+++ b/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 {
--
Gitblit v1.9.1