sync with master

This commit is contained in:
Ad Schellevis 2015-03-12 13:46:39 +00:00
parent d3a1cfb87e
commit 4bc2eef495

View File

@ -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 {