Commit b2f81513 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch...

Merge branch '5935-crash-when-i-try-to-create-a-server-with-argonaut-plugin-and-without-dns-plugin' into '1.3-fixes'

Resolve "Crash when I try to create a server with argonaut plugin and without dns plugin"

See merge request fusiondirectory/fd-plugins!492
parents 0f28b875 04e54284
...@@ -149,7 +149,11 @@ class argonautDNSConfig extends simpleService ...@@ -149,7 +149,11 @@ class argonautDNSConfig extends simpleService
{ {
global $config; global $config;
$attributesInfo = $this->getAttributesInfo(); $attributesInfo = $this->getAttributesInfo();
$zones = objects::ls('dnsZone', NULL, NULL, '', TRUE); try {
$zones = objects::ls('dnsZone', NULL, NULL, '', TRUE);
} catch (NonExistingObjectTypeException $e) {
$zones = array();
}
if (!empty($zones)) { if (!empty($zones)) {
$attributes = $attributesInfo['slave']['attrs'][0]->attribute->attributes; $attributes = $attributesInfo['slave']['attrs'][0]->attribute->attributes;
$attributes[0] = new SelectAttribute( $attributes[0] = new SelectAttribute(
......
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