Skip to content

Commit 72d7c3c

Browse files
committed
Fixed some php warnings in update script that appear when a version without multiserver replication is updated.
1 parent ec43cef commit 72d7c3c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

install/update.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@
8989
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
9090
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
9191

92-
$conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
93-
$conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
94-
$conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
95-
$conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
92+
if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
93+
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
94+
if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
95+
if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
9696

9797
// Resolve the IP address of the mysql hostname.
9898
if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);

0 commit comments

Comments
 (0)