Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm · Till Brehm · commit a8c7aba17042 · 2016-12-29T17:04:14.000+01:00
Fixes #4393



See merge request !497
diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php
@@ -98,8 +98,7 @@ function webdav_domains($field, $record) {
 			}
 		}
 		if(count($server_ids) == 0) return array();
-		$server_ids = implode(',', $server_ids);
-		$records = $app->db->queryAllRecords("SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id IN (?) AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain", $server_ids);
+		$records = $app->db->queryAllRecords("SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id IN ? AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain", $server_ids);
 
 		$records_new = array();
 		if(is_array($records)) {

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ function webdav_domains($field, $record) {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`if(count($server_ids) == 0) return array();`
`101`		`- $server_ids = implode(',', $server_ids);`
`102`		`- $records = $app->db->queryAllRecords("SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id IN (?) AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain", $server_ids);`
	`101`	`+ $records = $app->db->queryAllRecords("SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id IN ? AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain", $server_ids);`
`103`	`102`
`104`	`103`	`$records_new = array();`
`105`	`104`	`if(is_array($records)) {`