- Fixed "PHP Notice: Undefined property: installer::$ispconfig_interface_installed in /tmp/trunk/install/update.php on line 337" when updating an ISPConfig server with nginx.

falkotimme · falkotimme · commit d7cfd72a9d77 · 2011-09-23T10:47:53.000Z
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -137,7 +137,7 @@ public function find_installed_apps() {
 		if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
 		if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
 		
-		if ($conf['services']['web'] && $conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) $this->ispconfig_interface_installed = true;
+		if ($conf['services']['web'] && (($conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) || ($conf['nginx']['installed'] && is_file($conf['nginx']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")))) $this->ispconfig_interface_installed = true;
 	}
 
 	/** Create the database for ISPConfig */

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function find_installed_apps() {`
`137`	`137`	`if(is_installed('vzctl')) $conf['openvz']['installed'] = true;`
`138`	`138`	`if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;`
`139`	`139`
`140`		`- if ($conf['services']['web'] && $conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) $this->ispconfig_interface_installed = true;`
	`140`	`+ if ($conf['services']['web'] && (($conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) \|\| ($conf['nginx']['installed'] && is_file($conf['nginx']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")))) $this->ispconfig_interface_installed = true;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`/** Create the database for ISPConfig */`