From 43486922fac591683fcbe4335166c349f726c6eb Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Wed, 31 Aug 2011 09:36:27 -0400 Subject: [PATCH] Improve error reporting in installer --- installer/rcube_install.php | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/installer/rcube_install.php b/installer/rcube_install.php index c8c103a..ff3f7a4 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -5,7 +5,7 @@ | rcube_install.php | | | | This file is part of the Roundcube Webmail package | - | Copyright (C) 2008-2009, The Roundcube Dev Team | + | Copyright (C) 2008-2011, The Roundcube Dev Team | | Licensed under the GNU Public License | +-----------------------------------------------------------------------+ @@ -95,14 +95,15 @@ */ function _load_config($suffix) { - @include RCMAIL_CONFIG_DIR . '/main.inc' . $suffix; - if (is_array($rcmail_config)) { - $this->config += $rcmail_config; + if (is_readable($main_inc = RCMAIL_CONFIG_DIR . '/main.inc' . $suffix)) { + include($main_inc); + if (is_array($rcmail_config)) + $this->config += $rcmail_config; } - - @include RCMAIL_CONFIG_DIR . '/db.inc'. $suffix; - if (is_array($rcmail_config)) { - $this->config += $rcmail_config; + if (is_readable($db_inc = RCMAIL_CONFIG_DIR . '/db.inc'. $suffix)) { + include($db_inc); + if (is_array($rcmail_config)) + $this->config += $rcmail_config; } } -- Gitblit v1.9.1