Merge pull request #64 from mooore-digital/develop

Develop
mooore-digital · Jan 11, 2022 · c7c1cbd · c7c1cbd
2 parents e19a66a + 3ba8ed1
commit c7c1cbd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.7] - 2022-01-11
+### Fixed
+- Resolved wrongly fixed merge conflict
+
 ## [0.8.6] - 2022-01-10
 ### Fixed
 - Sometimes double-dashes gets encoded to one from API

diff --git a/Plugin/Model/PagePlugin.php b/Plugin/Model/PagePlugin.php
@@ -6,7 +6,6 @@
 
 use Magento\Cms\Model\Page;
 use Magento\Framework\Exception\LocalizedException;
-use Mooore\WordpressIntegrationCms\Model\RemotePageRepository;
 use Mooore\WordpressIntegrationCms\Resolver\RemotePageResolver;
 
 class PagePlugin
@@ -38,23 +37,6 @@ public function aroundGetContent(Page $subject, callable $proceed)
             return $proceed();
         }
 
-        $html = $remotePage['content']['rendered'];
-
-        $html = preg_replace_callback("{{{(.*)}}}", function ($matches) {
-            $match = $matches[0];
-
-            // Solve wierd encoding from Wordpress API regarding double-dashes
-            $match = preg_replace('/([^\s])&#8211;([^\s])/m', '$1--$2', $match);
-
-            $match = html_entity_decode($match);
-            $match = str_replace('”', '"', $match); // Opening quote
-            $match = str_replace('″', '"', $match); // Ending quote
-            $match = str_replace('“', '``', $match); // Double quotes
-            return $match;
-        }, $html);
-
-        $this->remotePageContentCache[$remotePageId] = $html;
-
         return $html;
     }
 }
diff --git a/Resolver/RemotePageResolver.php b/Resolver/RemotePageResolver.php
@@ -43,9 +43,12 @@ public function resolve(int $siteId, int $pageId): ?string
         /** @var string $html */
         $html = $remotePage['content']['rendered'];
 
-        $html = preg_replace_callback("{{(.*)}}", function ($matches) {
+        $html = preg_replace_callback("{{{(.*)}}}", function ($matches) {
             $match = $matches[0];
 
+            // Solve wierd encoding from Wordpress API regarding double-dashes
+            $match = preg_replace('/([^\s])&#8211;([^\s])/m', '$1--$2', $match);
+
             $match = html_entity_decode($match);
             $match = str_replace('”', '"', $match); // Opening quote
             $match = str_replace('″', '"', $match); // Ending quote