Allowed page includes on custom home

For #2279
Old hold-over for when include content permissions were handled less
delicately.

diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index b4cc1b81c8c1e01396d515951403253b6f5b4976..661c554da4809c799d38f2aba8321756ca992019 100644 (file)
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -316,6 +316,7 @@ class PageContent
             }
 
             // Find page and skip this if page not found
             }
 
             // Find page and skip this if page not found

+            /** @var ?Page $matchedPage */

             $matchedPage = Page::visible()->find($pageId);
             if ($matchedPage === null) {
                 $html = str_replace($fullMatch, '', $html);
             $matchedPage = Page::visible()->find($pageId);
             if ($matchedPage === null) {
                 $html = str_replace($fullMatch, '', $html);

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 6706de575f454ace49e87ebe4fbac6459fedd54c..5451c0abfe8289730e26649eec36c713aa3c5d36 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -96,9 +96,10 @@ class HomeController extends Controller
         if ($homepageOption === 'page') {
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);
         if ($homepageOption === 'page') {
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);

+            /** @var Page $customHomepage */

             $customHomepage = Page::query()->where('draft', '=', false)->findOrFail($id);
             $pageContent = new PageContent($customHomepage);
             $customHomepage = Page::query()->where('draft', '=', false)->findOrFail($id);
             $pageContent = new PageContent($customHomepage);

-            $customHomepage->html = $pageContent->render(true);
+            $customHomepage->html = $pageContent->render(false);

 
             return view('home.specific-page', array_merge($commonData, ['customHomepage' => $customHomepage]));
         }
 
             return view('home.specific-page', array_merge($commonData, ['customHomepage' => $customHomepage]));
         }

diff --git a/tests/HomepageTest.php b/tests/HomepageTest.php
index db4e94c6d11b1a03fe6a0a12e40e61f36dddbfdc..e27b787745ff3db74ed5db183fb2fe7b9afbd30b 100644 (file)
--- a/tests/HomepageTest.php
+++ b/tests/HomepageTest.php
@@ -5,6 +5,7 @@ namespace Tests;
 use BookStack\Auth\Role;
 use BookStack\Auth\User;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Auth\Role;
 use BookStack\Auth\User;
 use BookStack\Entities\Models\Bookshelf;

+use BookStack\Entities\Models\Page;

 
 class HomepageTest extends TestCase
 {
 
 class HomepageTest extends TestCase
 {


@@ -78,6 +79,25 @@ class HomepageTest extends TestCase
         $pageDeleteReq->assertSessionMissing('error');
     }
 
         $pageDeleteReq->assertSessionMissing('error');
     }
 

+    public function test_custom_homepage_renders_includes()
+    {
+        $this->asEditor();
+        /** @var Page $included */
+        $included = Page::query()->first();
+        $content = str_repeat('This is the body content of my custom homepage.', 20);
+        $included->html = $content;
+        $included->save();
+
+        $name = 'My custom homepage';
+        $customPage = $this->newPage(['name' => $name, 'html' => '{{@' . $included->id . '}}']);
+        $this->setSettings(['app-homepage' => $customPage->id]);
+        $this->setSettings(['app-homepage-type' => 'page']);
+
+        $homeVisit = $this->get('/');
+        $homeVisit->assertSee($name);
+        $homeVisit->assertSee($content);
+    }
+

     public function test_set_book_homepage()
     {
         $editor = $this->getEditor();
     public function test_set_book_homepage()
     {
         $editor = $this->getEditor();