Merge remote-tracking branch 'mainline/2.1-develop' into 2.1.14-merged

sanganinamrata · Jul 2, 2018 · 5adf28c · 5adf28c
2 parents cbdee0d + 80c28a5
commit 5adf28c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/internal/Magento/Framework/View/Layout.php b/lib/internal/Magento/Framework/View/Layout.php
@@ -517,7 +517,7 @@ public function renderNonCachedElement($name)
             } elseif ($this->isBlock($name)) {
                 $result = $this->_renderBlock($name);
             } else {
-                $result = $this->_renderContainer($name);
+                $result = $this->_renderContainer($name, false);
             }
         } catch (\Exception $e) {
             if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
@@ -559,14 +559,15 @@ protected function _renderUiComponent($name)
      * Gets HTML of container element
      *
      * @param string $name
+     * @param bool $useCache
      * @return string
      */
-    protected function _renderContainer($name)
+    protected function _renderContainer($name, $useCache = true)
     {
         $html = '';
         $children = $this->getChildNames($name);
         foreach ($children as $child) {
-            $html .= $this->renderElement($child);
+            $html .= $this->renderElement($child, $useCache);
         }
         if ($html == '' || !$this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_TAG)) {
             return $html;