Merge branch 'MC-23790' of github.com:magento-cia/magento2ce into cia-bugfixes-2.4.4-develop-04112021

Author: admanesachin

app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php

@@ -66,24 +66,24 @@ public function prepareDataSource(array $dataSource)
                             'href' => $this->urlBuilder->getUrl(
                                 static::URL_PATH_EDIT,
                                 [
-                                    'block_id' => $item['block_id'],
+                                    'block_id' => $item['block_id']
                                 ]
                             ),
-                            'label' => __('Edit'),
+                            'label' => __('Edit')
                         ],
                         'delete' => [
                             'href' => $this->urlBuilder->getUrl(
                                 static::URL_PATH_DELETE,
                                 [
-                                    'block_id' => $item['block_id'],
+                                    'block_id' => $item['block_id']
                                 ]
                             ),
                             'label' => __('Delete'),
                             'confirm' => [
                                 'title' => __('Delete %1', $title),
-                                'message' => __('Are you sure you want to delete a %1 record?', $title),
+                                'message' => __('Are you sure you want to delete a %1 record?', $title)
                             ],
-                            'post' => true,
+                            'post' => true
                         ],
                     ];
                 }

app/code/Magento/Ui/Component/Filters/Type/Select.php

@@ -79,7 +79,8 @@ public function prepare()
             'config',
             array_replace_recursive(
                 (array)$this->wrappedComponent->getData('config'),
-                (array)$this->getData('config')
+                (array)$this->getData('config'),
+                ['__disableTmpl' => ['label' => true]]
             )
         );
 

app/code/Magento/Ui/Component/Listing/Columns/Column.php

@@ -87,7 +87,8 @@ public function prepare()
                 'config',
                 array_replace_recursive(
                     (array)$this->wrappedComponent->getData('config'),
-                    (array)$this->getData('config')
+                    (array)$this->getData('config'),
+                    ['__disableTmpl' => ['label' => true]]
                 )
             );
         }