From c8509bf2e438adcf80591a6bc072359d6d44ed97 Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Tue, 17 Nov 2015 17:24:09 +0100 Subject: [PATCH] - allow partly configured autoinstall.ini --- install/install.php | 4 ++++ install/update.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/install/install.php b/install/install.php index f680e7659..01c59bd74 100644 --- a/install/install.php +++ b/install/install.php @@ -115,6 +115,10 @@ if(isset($cmd_opt['autoinstall']) && is_file($cmd_opt['autoinstall'])) { include_once $cmd_opt['autoinstall']; } elseif($path_parts['extension'] == 'ini') { $tmp = ini_to_array(file_get_contents('autoinstall.ini')); + if(!is_array($tmp['install'])) $tmp['install'] = array(); + if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array(); + if(!is_array($tmp['expert'])) $tmp['expert'] = array(); + if(!is_array($tmp['update'])) $tmp['update'] = array(); $autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update']; unset($tmp); } diff --git a/install/update.php b/install/update.php index 0e8f6bd38..3eeedd0e7 100644 --- a/install/update.php +++ b/install/update.php @@ -120,6 +120,10 @@ if(isset($cmd_opt['autoinstall']) && is_file($cmd_opt['autoinstall'])) { include_once $cmd_opt['autoinstall']; } elseif($path_parts['extension'] == 'ini') { $tmp = ini_to_array(file_get_contents('autoinstall.ini')); + if(!is_array($tmp['install'])) $tmp['install'] = array(); + if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array(); + if(!is_array($tmp['expert'])) $tmp['expert'] = array(); + if(!is_array($tmp['update'])) $tmp['update'] = array(); $autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update']; unset($tmp); } -- GitLab