Merge branch 'patch-2' into 'master'

Don´t prompt to 'Re-enter admin password' with --autoinstall



See merge request !595

Author: Marius Burkard

install/install.php

@@ -553,7 +553,7 @@
 	//** Customise the port ISPConfig runs on
 	$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
 	$conf['interface_password'] = $inst->free_query('Admin password', 'admin','ispconfig_admin_password');
-	if($conf['interface_password'] != 'admin') {
+	if(!AUTOINSTALL && $conf['interface_password'] != 'admin') {
 		$check = false;
 		do {
 			unset($temp_password);