PB-370: Introduce upgrade mechanism for Page Builder content

omiroshnichenko · omiroshnichenko · commit 912abc4abde1 · 2020-02-12T00:50:11.000-06:00
- fix content upgrade
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Document.php b/app/code/Magento/PageBuilder/Model/Dom/Document.php
@@ -209,7 +209,18 @@ public function getMetadata($key = null)
      */
     public function stripHtmlWrapperTags(): string
     {
-        preg_match('/<body>(.*)<\/body>/', $this->getContents(), $matches);
-        return isset($matches[1]) ? $matches[1] : '';
+        $result = '';
+        preg_match('/<body>(.*)<\/body>/s', $this->saveHTML(), $matches);
+
+        if (isset($matches[1])) {
+            $result = preg_replace_callback(
+                '/=\"(%7B%7B[^"]*%7D%7D)\"/m',
+                function ($matches) {
+                    return urldecode($matches[0]);
+                },
+                $matches[1]
+            );
+        }
+        return $result;
     }
 }
diff --git a/app/code/Magento/PageBuilder/Setup/Converters/FixFullWidthRowPadding.php b/app/code/Magento/PageBuilder/Setup/Converters/FixFullWidthRowPadding.php
@@ -50,6 +50,6 @@ public function convert($value)
             $innerDiv = $row->querySelector(".row-full-width-inner");
             $innerDiv->addStyle("padding", $padding);
         }
-        return $fullWidthRows->count() > 0 ? $document->stripHtmlWrapperTags() : $value;
+        return $fullWidthRows->count() > 0 ? ($document->stripHtmlWrapperTags() ?: $value) : $value;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ public function convert($value)`
`50`	`50`	`$innerDiv = $row->querySelector(".row-full-width-inner");`
`51`	`51`	`$innerDiv->addStyle("padding", $padding);`
`52`	`52`	`}`
`53`		`- return $fullWidthRows->count() > 0 ? $document->stripHtmlWrapperTags() : $value;`
	`53`	`+ return $fullWidthRows->count() > 0 ? ($document->stripHtmlWrapperTags() ?: $value) : $value;`
`54`	`54`	`}`
`55`	`55`	`}`