Skip to content

Commit ed30c60

Browse files
committed
Fixed some warnings in the installer.
1 parent c5d17d3 commit ed30c60

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

install/lib/installer_base.lib.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ public function configure_mailman($status = 'insert') {
554554
$virtual_domains = "' '";
555555

556556
$content = str_replace('{hostname}', $conf['hostname'], $content);
557+
if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = ''
557558
$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
558559
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
559560

install/lib/update.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ function updateDbAndIni() {
9595
$conf['services']['file'] = ($tmp['file_server'] == 1)?true:false;
9696
$conf['services']['db'] = ($tmp['db_server'] == 1)?true:false;
9797
$conf['services']['vserver'] = ($tmp['vserver_server'] == 1)?true:false;
98-
$conf['services']['proxy'] = ($tmp['proxy_server'] == 1)?true:false;
99-
$conf['services']['firewall'] = ($tmp['firewall_server'] == 1)?true:false;
98+
$conf['services']['proxy'] = (isset($tmp['proxy_server']) && $tmp['proxy_server'] == 1)?true:false;
99+
$conf['services']['firewall'] = (isset($tmp['firewall_server']) && $tmp['firewall_server'] == 1)?true:false;
100100

101101
$conf['postfix']['vmail_mailbox_base'] = $ini_array['mail']['homedir_path'];
102102

0 commit comments

Comments
 (0)