From 15a03f63a9d6de0ab63738dd6eff0431289208c7 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 15 Oct 2010 11:51:15 +0000 Subject: [PATCH] - only use makeCorrectFile() on SSLCertificateChainFile if not empty --- install/updates/froxlor/0.9/update_0.9.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 570669fb..6f3d7cca 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1127,7 +1127,12 @@ if(isFroxlorVersion('0.9.14-svn3')) { showUpdateStep("Updating from 0.9.14-svn3 to 0.9.14-svn4", false); - $update_ssl_cert_chainfile = isset($_POST['update_ssl_cert_chainfile']) ? makeCorrectFile($_POST['update_ssl_cert_chainfile']) : ''; + $update_ssl_cert_chainfile = isset($_POST['update_ssl_cert_chainfile']) ? $_POST['update_ssl_cert_chainfile'] : ''; + + if($update_ssl_cert_chainfile != '') + { + $update_ssl_cert_chainfile = makeCorrectFile($update_ssl_cert_chainfile); + } showUpdateStep("Adding SSLCertificateChainFile to the settings"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'ssl_cert_chainfile', '".$db->escape($update_ssl_cert_chainfile)."');");