Review of #4192, Fixed formatting and added test

diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index 67f3ea338f981849762247c66548972dd879b934..a12a19c661e431fee733dd449ffd27f167763820 100644 (file)
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -303,10 +303,10 @@ class PageContent
 
         if ($blankIncludes) {
             $content = $this->blankPageIncludes($content);
 
         if ($blankIncludes) {
             $content = $this->blankPageIncludes($content);

-            } else {
-                for ($includeDepth = 0; $includeDepth <= 3; $includeDepth++) {
-                    $content = $this->parsePageIncludes($content);
-                }
+        } else {
+            for ($includeDepth = 0; $includeDepth <= 3; $includeDepth++) {
+                $content = $this->parsePageIncludes($content);
+            }

         }
 
         return $content;
         }
 
         return $content;

diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 6d6224abf4be6d63b0407a1a0e42eeec568e7bd5..cf67e27e24a77be3b2067a4e1d98eb89ac1b6d9d 100644 (file)
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -108,6 +108,17 @@ class PageContentTest extends TestCase
         $htmlContent->assertSee('my cat is awesome and scratchy');
     }
 
         $htmlContent->assertSee('my cat is awesome and scratchy');
     }
 

+    public function test_page_includes_can_be_nested_up_to_three_times()
+    {
+        $page = $this->entities->page();
+        $tag = "{{@{$page->id}#bkmrk-test}}";
+        $page->html = '<p id="bkmrk-test">Hello Barry ' . $tag . '</p>';
+        $page->save();
+
+        $pageResp = $this->asEditor()->get($page->getUrl());
+        $this->withHtml($pageResp)->assertElementContains('#bkmrk-test', 'Hello Barry Hello Barry Hello Barry ' . $tag);
+    }
+

     public function test_page_content_scripts_removed_by_default()
     {
         $this->asEditor();
     public function test_page_content_scripts_removed_by_default()
     {
         $this->asEditor();