From 72d7c3c501c9ec7f6d2a28e03beed23ab90d23e8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 7 Dec 2008 12:39:15 +0000
Subject: [PATCH] Fixed some php warnings in update script that appear when a
version without multiserver replication is updated.
---
install/update.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/update.php b/install/update.php
index 5a589d28a..5ac9cb4ee 100644
--- a/install/update.php
+++ b/install/update.php
@@ -89,10 +89,10 @@ $conf['mysql']['charset'] = 'utf8';
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
-$conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
-$conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
-$conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
-$conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
+if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
+if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
+if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
+if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
// Resolve the IP address of the mysql hostname.
if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);
--
GitLab