From 4bc2eef495b2d73ca0528ed9a0f98c5f895474f8 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 12 Mar 2015 13:46:39 +0000
Subject: [PATCH] sync with master

---
 src/opnsense/mvc/app/library/OPNsense/Core/Config.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
index db74938dc..71b030dfa 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
@@ -277,7 +277,12 @@ class Config extends Singleton
                 }
             }
             foreach ($revision as $revKey => $revItem) {
-                $childNode = $node->addChild($revKey);
+                if (isset($node->{$revKey})) {
+                    // key already in revision object
+                    $childNode = $node->{$revKey};
+                } else {
+                    $childNode = $node->addChild($revKey);
+                }
                 if (is_array($revItem)) {
                     $this->updateRevision($revItem, $childNode);
                 } else {