From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 25 Jul 2011 14:38:22 +0000 Subject: [PATCH] Fixed some warnings in the installer. --- install/lib/installer_base.lib.php | 1 + install/lib/update.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index d39db4492..c7ec0ca6f 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -554,6 +554,7 @@ class installer_base { $virtual_domains = "' '"; $content = str_replace('{hostname}', $conf['hostname'], $content); + if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = '' $content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content); $content = str_replace('{virtual_domains}', $virtual_domains, $content); diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index 4cc735568..cf4809fa7 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -95,8 +95,8 @@ function updateDbAndIni() { $conf['services']['file'] = ($tmp['file_server'] == 1)?true:false; $conf['services']['db'] = ($tmp['db_server'] == 1)?true:false; $conf['services']['vserver'] = ($tmp['vserver_server'] == 1)?true:false; - $conf['services']['proxy'] = ($tmp['proxy_server'] == 1)?true:false; - $conf['services']['firewall'] = ($tmp['firewall_server'] == 1)?true:false; + $conf['services']['proxy'] = (isset($tmp['proxy_server']) && $tmp['proxy_server'] == 1)?true:false; + $conf['services']['firewall'] = (isset($tmp['firewall_server']) && $tmp['firewall_server'] == 1)?true:false; $conf['postfix']['vmail_mailbox_base'] = $ini_array['mail']['homedir_path']; -- GitLab