Skip to content

Commit 6a52bd3

Browse files
author
Sergey Shvets
committed
MAGETWO-83646: Encrypted scope-specific config values fail to decrypt on PHP7 #8591
1 parent ec26ddf commit 6a52bd3

File tree

2 files changed

+117
-214
lines changed

2 files changed

+117
-214
lines changed

app/code/Magento/Config/Block/System/Config/Form.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Config\Block\System\Config;
78

89
use Magento\Config\App\Config\Type\System;
@@ -350,21 +351,21 @@ protected function _initElement(
350351
$data = $this->_configData[$path];
351352
$inherit = false;
352353

353-
if ($field->hasBackendModel()) {
354-
$backendModel = $field->getBackendModel();
355-
$backendModel->setPath($path)
356-
->setValue($data)
357-
->setWebsite($this->getWebsiteCode())
358-
->setStore($this->getStoreCode())
359-
->afterLoad();
360-
$data = $backendModel->getValue();
361-
}
362-
363354
} elseif ($field->getConfigPath() !== null) {
364355
$data = $this->getConfigValue($field->getConfigPath());
365356
} else {
366357
$data = $this->getConfigValue($path);
367358
}
359+
360+
if ($field->hasBackendModel()) {
361+
$backendModel = $field->getBackendModel();
362+
$backendModel->setPath($path)
363+
->setValue($data)
364+
->setWebsite($this->getWebsiteCode())
365+
->setStore($this->getStoreCode())
366+
->afterLoad();
367+
$data = $backendModel->getValue();
368+
}
368369
}
369370
$fieldRendererClass = $field->getFrontendModel();
370371
if ($fieldRendererClass) {

0 commit comments

Comments
 (0)