From 1e121abcc0a80d0ce80e34c7bf88e980bf788270 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 10:09:36 -0400
Subject: [PATCH] Merge branch 'Cambra/ispconfig3-favourite_servers'

---
 interface/web/admin/system_config_edit.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/system_config_edit.php b/interface/web/admin/system_config_edit.php
index 3a2ac8e..a793a83 100644
--- a/interface/web/admin/system_config_edit.php
+++ b/interface/web/admin/system_config_edit.php
@@ -64,6 +64,9 @@
 			$server_id = $this->id;
 
 			$this->dataRecord = $app->getconf->get_global_config($section);
+			if (is_null($this->dataRecord)) {
+				$this->dataRecord = array();
+			}
 			if ($section == 'domains'){
 				if (isset($this->dataRecord['use_domain_module'])){
 					$_SESSION['use_domain_module_old_value'] = $this->dataRecord['use_domain_module'];

--
Gitblit v1.9.1