sync with master

4bc2eef4 · Ad Schellevis · d3a1cfb8 · 4bc2eef4
Commit 4bc2eef4 authored Mar 12, 2015 by Ad Schellevis
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Config.php src/opnsense/mvc/app/library/OPNsense/Core/Config.php +6 -1

No files found.
--- 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 {