Skip to content

Commit

Permalink
Merge forwardport of #12606 to 2.3-develop branch
Browse files Browse the repository at this point in the history
Applied pull request patch https://github.com/magento/magento2/pull/12606.patch (created by @Alanaktion) based on commit(s):
  1. bf611be
  • Loading branch information
magento-engcom-team authored Jan 24, 2018
2 parents 72b3991 + d173193 commit 5483dc7
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ protected function _prepareConfigurationData($themePackage)
$media = $themeConfig->getMedia();

$parentPathPieces = $themeConfig->getParentTheme();
if (count($parentPathPieces) == 1) {
if (is_array($parentPathPieces) && count($parentPathPieces) == 1) {
$pathPieces = $pathData['theme_path_pieces'];
array_pop($pathPieces);
$parentPathPieces = array_merge($pathPieces, $parentPathPieces);
Expand Down

0 comments on commit 5483dc7

Please sign in to comment.