diff options
| -rw-r--r-- | installer/check.php | 2 | ||||
| -rw-r--r-- | installer/config.php | 6 | ||||
| -rw-r--r-- | installer/rcube_install.php | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/installer/check.php b/installer/check.php index 45aacde16..8352364f5 100644 --- a/installer/check.php +++ b/installer/check.php @@ -31,7 +31,7 @@ $source_urls = array( 'Mail_mime' => 'http://pear.php.net/package/Mail_mime' ); -echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 2 : 3) . '" />'; +echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />'; ?> <h3>Checking PHP version</h3> diff --git a/installer/config.php b/installer/config.php index afea04724..5b365a5a5 100644 --- a/installer/config.php +++ b/installer/config.php @@ -251,9 +251,13 @@ echo $select_dbba->show($RCI->getprop('db_backend')); <?php $text_imaphost = new textfield(array('name' => '_default_host[]', 'size' => 30)); +$default_hosts = $RCI->get_hostlist(); + +if (empty($default_hosts)) + $default_hosts = array(''); $i = 0; -foreach ($RCI->get_hostlist() as $host) { +foreach ($default_hosts as $host) { echo '<div id="defaulthostentry'.$i.'">' . $text_imaphost->show($host); if ($i++ > 0) echo '<a href="#" onclick="removehostfield(this.parentNode);return false" class="removelink" title="Remove this entry">remove</a>'; diff --git a/installer/rcube_install.php b/installer/rcube_install.php index efe139d7d..79d003cdf 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -79,7 +79,7 @@ class rcube_install */ function _load_config($suffix) { - include '../config/main.inc' . $suffix; + @include '../config/main.inc' . $suffix; if (is_array($rcmail_config)) { $this->config += $rcmail_config; } |