From b533b414a075013307447a3fb895b1625504d477 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 21 Oct 2013 07:15:00 -0400
Subject: [PATCH] Merge remote-tracking branch 'florian030/master'
---
interface/lib/classes/custom_datasource.inc.php | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php
index 43538d6..35bf7d5 100644
--- a/interface/lib/classes/custom_datasource.inc.php
+++ b/interface/lib/classes/custom_datasource.inc.php
@@ -75,6 +75,7 @@
if($web_config['server_type'] != 'nginx') $server_ids[] = $server['server_id'];
}
}
+ if(count($server_ids) == 0) return array();
$server_ids = implode(',', $server_ids);
$records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND server_id IN (".$server_ids.") AND ".$app->tform->getAuthSQL('r')." ORDER BY domain");
@@ -104,6 +105,9 @@
case 'default_dnsserver':
$field = 'dns_server';
break;
+ case 'default_slave_dnsserver':
+ $field = 'dns_server';
+ break;
case 'default_fileserver':
$field = 'file_server';
break;
--
Gitblit v1.9.1