From a5714c39c76695af5b2220e93a4ac3121a9d83a1 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 17 Nov 2015 12:59:40 -0500
Subject: [PATCH] Merge branch 'stable-3.0.5'

---
 install/update.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/install/update.php b/install/update.php
index 970a107..840a52a 100644
--- a/install/update.php
+++ b/install/update.php
@@ -120,6 +120,10 @@
 		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);
 	}

--
Gitblit v1.9.1