MAGETWO-85587: [2.3-develop] Fixes #12660 invalid parameter configura…

…tion provided for argument #12665 - Merge Pull Request #12665 from lcbrq/magento2:2.3-develop - Merged commits: 1. 9516978
magento · Dec 13, 2017 · 5019b52 · 5019b52
2 parents eeed63e + 9516978
commit 5019b52
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
@@ -147,6 +147,14 @@ protected function createChildComponent(
         }
         $components = array_filter($components);
         $componentArguments['components'] = $components;
+
+       /**
+        * Prevent passing ACL restricted blocks to htmlContent constructor
+        */
+        if (isset($componentArguments['block']) && !$componentArguments['block']) {
+            return null;
+        }
+
         if (!isset($componentArguments['context'])) {
             $componentArguments['context'] = $renderContext;
         }