MAGETWO-85580: Fixes #12660 invalid parameter configuration provided …

…for argument #12661
magento · Dec 13, 2017 · f4e97f3 · f4e97f3
2 parents 71d1610 + 47f52b3
commit f4e97f3
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;
         }