From bc55aadd8a7a2d9711b5bd223272e17376cb73d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=2E=20T=C3=A4ffner?= <darkalex@firesplash.de>
Date: Tue, 13 Sep 2016 11:22:50 +0200
Subject: [PATCH] added server ini config to $conf and corrected check for apps
vhost enabled
---
install/update.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/install/update.php b/install/update.php
index aafb69898e..ac052f8dd2 100644
--- a/install/update.php
+++ b/install/update.php
@@ -287,6 +287,11 @@ checkDbHealth();
*/
updateDbAndIni();
+//** read server config from db into $conf['server_config']
+$tmp = $inst->db->queryOneRecord("SELECT config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
+$conf['server_config'] = ini_to_array(stripslashes($tmp['config']));
+unset($tmp);
+
/*
* Reconfigure the permisson if needed
* (if this is done at client side, only this client is updated.
@@ -428,7 +433,7 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
$inst->configure_nginx();
}
- if ($conf['web']['apps_vhost_enabled'] == 'y') {
+ if ($conf['server_config']['web']['apps_vhost_enabled'] == 'y') {
//** Configure apps vhost
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
--
GitLab