From 32359545d3252129bbf8d508534687680c01c59a Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 13 Mar 2015 14:11:37 +0000
Subject: [PATCH] sync with master

---
 src/opnsense/mvc/app/library/OPNsense/Core/Config.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
index b4005b4da..74c3c7f24 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
@@ -93,7 +93,8 @@ class Config extends Singleton
                     $old_content = $result[$xmlNode->getName()];
                     // check if array content is associative, if move items to list
                     if (array_keys($old_content) !== range(0, count($old_content) - 1) ||
-                        array_key_exists($xmlNode->getName(), $forceList)) {
+                        (is_array($forceList) && array_key_exists($xmlNode->getName(), $forceList))
+                    ) {
                         $result[$xmlNode->getName()] = array();
                         $result[$xmlNode->getName()][] = $old_content;
                     }
@@ -113,7 +114,7 @@ class Config extends Singleton
                     $result[$xmlNode->getName()][] = $xmlNode->__toString();
                 } else {
                     // single content item
-                    if (array_key_exists($xmlNode->getName(), $forceList)) {
+                    if (is_array($forceList) && array_key_exists($xmlNode->getName(), $forceList)) {
                         $result[$xmlNode->getName()] = array();
                         $result[$xmlNode->getName()][] = $xmlNode->__toString();
                     } else {