X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a61c9c5e98b0a411b081543e3eaf1994d12919b3..refs/heads/ldap_host_failover:/app/Http/Controllers/HomeController.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 6706de575..f38bd71df 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -2,7 +2,7 @@ namespace BookStack\Http\Controllers; -use Activity; +use BookStack\Actions\ActivityQueries; use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Page; use BookStack\Entities\Queries\RecentlyViewed; @@ -16,9 +16,9 @@ class HomeController extends Controller /** * Display the homepage. */ - public function index() + public function index(ActivityQueries $activities) { - $activity = Activity::latest(10); + $activity = $activities->latest(10); $draftPages = []; if ($this->isSignedIn()) { @@ -39,7 +39,7 @@ class HomeController extends Controller $recentlyUpdatedPages = Page::visible()->with('book') ->where('draft', false) ->orderBy('updated_at', 'desc') - ->take($favourites->count() > 0 ? 6 : 12) + ->take($favourites->count() > 0 ? 5 : 10) ->select(Page::$listAttributes) ->get(); @@ -96,9 +96,10 @@ class HomeController extends Controller 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->html = $pageContent->render(true); + $customHomepage->html = $pageContent->render(false); return view('home.specific-page', array_merge($commonData, ['customHomepage' => $customHomepage])); } @@ -106,14 +107,6 @@ class HomeController extends Controller return view('home.default', $commonData); } - /** - * Get custom head HTML, Used in ajax calls to show in editor. - */ - public function customHeadContent() - { - return view('common.custom-head'); - } - /** * Show the view for /robots.txt. */