Commit a0f8f9f7 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6091-disabled-ipv4-address-shows-up-in-ipv4-field' into 'develop'

Resolve "Disabled IPv4 address shows up in IPV4 field"

Closes #6091

See merge request ispconfig/ispconfig3!1430
parents 07dcf84b 89bc625a
......@@ -45,7 +45,7 @@ $ip_type = $_GET['ip_type'];
$web_config = $app->getconf->get_server_config($server_id, 'web');
$tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $client_group_id);
$sql = "SELECT ip_address FROM server_ip WHERE ip_type = ? AND server_id = ? AND (client_id = 0 OR client_id=?)";
$sql = "SELECT ip_address FROM server_ip WHERE ip_type = ? AND server_id = ? AND virtualhost = 'y' AND (client_id = 0 OR client_id=?)";
$ips = $app->db->queryAllRecords($sql, $ip_type, $server_id, $tmp['client_id']);
// $ip_select = "<option value=''></option>";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment