Skip to content

Commit 5adf28c

Browse files
committed
Merge remote-tracking branch 'mainline/2.1-develop' into 2.1.14-merged
2 parents cbdee0d + 80c28a5 commit 5adf28c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/internal/Magento/Framework/View/Layout.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ public function renderNonCachedElement($name)
517517
} elseif ($this->isBlock($name)) {
518518
$result = $this->_renderBlock($name);
519519
} else {
520-
$result = $this->_renderContainer($name);
520+
$result = $this->_renderContainer($name, false);
521521
}
522522
} catch (\Exception $e) {
523523
if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
@@ -559,14 +559,15 @@ protected function _renderUiComponent($name)
559559
* Gets HTML of container element
560560
*
561561
* @param string $name
562+
* @param bool $useCache
562563
* @return string
563564
*/
564-
protected function _renderContainer($name)
565+
protected function _renderContainer($name, $useCache = true)
565566
{
566567
$html = '';
567568
$children = $this->getChildNames($name);
568569
foreach ($children as $child) {
569-
$html .= $this->renderElement($child);
570+
$html .= $this->renderElement($child, $useCache);
570571
}
571572
if ($html == '' || !$this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_TAG)) {
572573
return $html;

0 commit comments

Comments
 (0)