From 9516978a0f0064ae35b8c30cac4d9f0ece3b466b Mon Sep 17 00:00:00 2001
From: Tomasz Gregorczyk <tom@lcbrq.com>
Date: Wed, 13 Dec 2017 11:08:59 +0100
Subject: [PATCH] Fixes #12660 invalid parameter configuration provided for
 argument

---
 .../Magento/Framework/View/Element/UiComponentFactory.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
index 94d84dd0560df..93fe88a30f065 100755
--- 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;
         }