Merge branch 'patch-4' into 'stable-3.1'

Till Brehm · Till Brehm · commit 109e6c41712d · 2016-11-24T16:16:56.000+01:00
Fix #4339



See merge request !487
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
@@ -339,7 +339,7 @@ function onShowEnd() {
 			if($app->functions->intval($this->dataRecord["server_id"]) > 0) {
 				// check if server is in client's servers or add it.
 				$chk_sid = explode(',', $client['web_servers']);
-				if(in_array($this->dataRecord["server_id"], $client['web_servers']) == false) {
+				if(in_array($this->dataRecord["server_id"], $chk_sid) == false) {
 					if($client['web_servers'] != '') $client['web_servers'] .= ',';
 					$client['web_servers'] .= $app->functions->intval($this->dataRecord["server_id"]);
 				}

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ function onShowEnd() {`
`339`	`339`	`if($app->functions->intval($this->dataRecord["server_id"]) > 0) {`
`340`	`340`	`// check if server is in client's servers or add it.`
`341`	`341`	`$chk_sid = explode(',', $client['web_servers']);`
`342`		`- if(in_array($this->dataRecord["server_id"], $client['web_servers']) == false) {`
	`342`	`+ if(in_array($this->dataRecord["server_id"], $chk_sid) == false) {`
`343`	`343`	`if($client['web_servers'] != '') $client['web_servers'] .= ',';`
`344`	`344`	`$client['web_servers'] .= $app->functions->intval($this->dataRecord["server_id"]);`
`345`	`345`	`}`