From: JonatanRek <redacted>
Date: Fri, 22 Sep 2023 08:48:48 +0000 (+0200)
Subject: Merge branch 'BookStackApp:development' into basic-pwa-support
X-Git-Tag: v23.10~1^2~19^2~8^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/effc03e99e8a455932884dccf1195287f87d09a3

Merge branch 'BookStackApp:development' into basic-pwa-support
---

effc03e99e8a455932884dccf1195287f87d09a3
diff --cc app/App/HomeController.php
index d971247df,24b7c3ed8..927fdfc1d
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@@ -76,21 -76,21 +76,21 @@@ class HomeController extends Controlle
                  'listOptions' => $listOptions,
              ]);
          }
 -
 +        
          if ($homepageOption === 'bookshelves') {
-             $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+             $shelves = app()->make(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
              $data = array_merge($commonData, ['shelves' => $shelves]);
 -
 +            
              return view('home.shelves', $data);
          }
 -
 +        
          if ($homepageOption === 'books') {
-             $books = app(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+             $books = app()->make(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
              $data = array_merge($commonData, ['books' => $books]);
 -
 +            
              return view('home.books', $data);
          }
 -
 +        
          if ($homepageOption === 'page') {
              $homepageSetting = setting('app-homepage', '0:');
              $id = intval(explode(':', $homepageSetting)[0]);