Fixed broken table/ol/ul page includes

Fixes #640

diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php
index c31ddfefe46dbee7d6957cfb230458e622bfa6d9..24c680234241471caa275462832cd4f977178336 100644 (file)
--- a/app/Repos/EntityRepo.php
+++ b/app/Repos/EntityRepo.php
@@ -690,6 +690,7 @@ class EntityRepo
         preg_match_all("/{{@\s?([0-9].*?)}}/", $content, $matches);
         if (count($matches[0]) === 0) return $content;
 
         preg_match_all("/{{@\s?([0-9].*?)}}/", $content, $matches);
         if (count($matches[0]) === 0) return $content;
 

+        $topLevelTags = ['table', 'ul', 'ol'];

         foreach ($matches[1] as $index => $includeId) {
             $splitInclude = explode('#', $includeId, 2);
             $pageId = intval($splitInclude[0]);
         foreach ($matches[1] as $index => $includeId) {
             $splitInclude = explode('#', $includeId, 2);
             $pageId = intval($splitInclude[0]);


@@ -714,8 +715,13 @@ class EntityRepo
                 continue;
             }
             $innerContent = '';
                 continue;
             }
             $innerContent = '';

-            foreach ($matchingElem->childNodes as $childNode) {
-                $innerContent .= $doc->saveHTML($childNode);
+            $isTopLevel = in_array(strtolower($matchingElem->nodeName), $topLevelTags);
+            if ($isTopLevel) {
+                $innerContent .= $doc->saveHTML($matchingElem);
+            } else {
+                foreach ($matchingElem->childNodes as $childNode) {
+                    $innerContent .= $doc->saveHTML($childNode);
+                }

             }
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }
             }
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }

diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index cd6526aecb1758bb530b69a3b9a6a26d53b522c6..37051478882e94f25c9cb1f6f2c5f334779a043d 100644 (file)
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -9,7 +9,7 @@ class PageContentTest extends TestCase
     public function test_page_includes()
     {
         $page = Page::first();
     public function test_page_includes()
     {
         $page = Page::first();

-        $secondPage = Page::all()->get(2);
+        $secondPage = Page::where('id', '!=', $page->id)->first();

 
         $secondPage->html = "<p id='section1'>Hello, This is a test</p><p id='section2'>This is a second block of content</p>";
         $secondPage->save();
 
         $secondPage->html = "<p id='section1'>Hello, This is a test</p><p id='section2'>This is a second block of content</p>";
         $secondPage->save();


@@ -38,7 +38,7 @@ class PageContentTest extends TestCase
     public function test_saving_page_with_includes()
     {
         $page = Page::first();
     public function test_saving_page_with_includes()
     {
         $page = Page::first();

-        $secondPage = Page::all()->get(2);
+        $secondPage = Page::where('id', '!=', $page->id)->first();

         $this->asEditor();
         $page->html = "<p>{{@$secondPage->id}}</p>";
 
         $this->asEditor();
         $page->html = "<p>{{@$secondPage->id}}</p>";
 


@@ -50,6 +50,23 @@ class PageContentTest extends TestCase
         $this->assertContains("{{@$secondPage->id}}", $page->html);
     }
 
         $this->assertContains("{{@$secondPage->id}}", $page->html);
     }
 

+    public function test_page_includes_do_not_break_tables()
+    {
+        $page = Page::first();
+        $secondPage = Page::where('id', '!=', $page->id)->first();
+
+        $content = '<table id="table"><tbody><tr><td>test</td></tr></tbody></table>';
+        $secondPage->html = $content;
+        $secondPage->save();
+
+        $page->html = "{{@{$secondPage->id}#table}}";
+        $page->save();
+
+        $this->asEditor();
+        $pageResp = $this->get($page->getUrl());
+        $pageResp->assertSee($content);
+    }
+

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