From 13434f55e98e5eb5ad1f813c4749dff2771a19cc Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Thu, 22 Dec 2016 10:31:51 +0200
Subject: [PATCH] MAGETWO-62491: [PR] Delivery of stories (sprint 3)
---
app/code/Magento/Config/App/Config/Type/System.php | 2 ++
app/code/Magento/Config/Model/Config/Export/Comment.php | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index bdc9f88f6c7..0bf591ee503 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -96,7 +96,9 @@ class System implements ConfigTypeInterface
$data = $this->cache->load(self::CONFIG_TYPE);
if (!$data) {
$data = $this->preProcessor->process($this->source->get());
+ $this->data = new DataObject($data);
$data = $this->fallback->process($data);
+ $this->data = new DataObject($data);
//Placeholder processing need system config - so we need to save intermediate result
$data = $this->postProcessor->process($data);
$this->data = new DataObject($data);
diff --git a/app/code/Magento/Config/Model/Config/Export/Comment.php b/app/code/Magento/Config/Model/Config/Export/Comment.php
index 7f5aef70c0b..ae0431c82da 100644
--- a/app/code/Magento/Config/Model/Config/Export/Comment.php
+++ b/app/code/Magento/Config/Model/Config/Export/Comment.php
@@ -26,7 +26,6 @@ class Comment implements CommentInterface
private $source;
/**
- * Comment constructor.
* @param PlaceholderFactory $placeholderFactory
* @param DumpConfigSourceInterface $source
*/
--
GitLab