Merge branch 'develop' of https://github.com/mage-os/mirror-magento2-…

…page-builder into develop
mage-os · Aug 29, 2024 · 8cc6095 · 8cc6095
2 parents 1306370 + 2de0d7d
commit 8cc6095
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/code/Magento/PageBuilder/Model/Filter/Template.php b/app/code/Magento/PageBuilder/Model/Filter/Template.php
@@ -221,7 +221,7 @@ private function generateDecodedHtmlPlaceholderMappingInDocument(DOMDocument $do
             $htmlContentTypeNode->setAttribute('data-decoded', 'true');
 
             // if nothing exists inside the node, continue
-            if (!strlen(trim($htmlContentTypeNode->nodeValue))) {
+            if (!strlen(trim($htmlContentTypeNode->nodeValue ?? ''))) {
                 continue;
             }
 

diff --git a/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php b/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php
@@ -80,6 +80,7 @@ public function getReport($name) : \IteratorIterator
     {
         $query = $this->queryFactory->create($name);
 
+        $reportData = [];
         // Prepare our type count data
         $typeCounts = [];
         $contentTypes = $this->config->getContentTypes();
@@ -102,7 +103,7 @@ public function getReport($name) : \IteratorIterator
                     foreach ($contentTypes as $type) {
                         // Count the amount of content types within the content
                         $rowContent = $row['content'] ?? '';
-                        if (strlen($rowContent) > 0) {
+                        if ($rowContent !== null && strlen($rowContent) > 0) {
                             $typeCounts[$type['name']] += substr_count(
                                 $rowContent,
                                 'data-content-type="' . $type['name'] . '"'