Merge branch 'disable-comments' of git://github.com/Abijeet/BookStack into Abijeet-disable-comments

This commit is contained in:
Dan Brown
2017-12-07 19:15:26 +00:00
15 changed files with 69 additions and 9 deletions

View File

@ -161,13 +161,19 @@ class PageController extends Controller
$page->html = $this->entityRepo->renderPage($page);
$sidebarTree = $this->entityRepo->getBookChildren($page->book);
$pageNav = $this->entityRepo->getPageNav($page->html);
$page->load(['comments.createdBy']);
// check if the comment's are enabled
$areCommentsEnabled = !setting('app-disable-comments');
if ($areCommentsEnabled) {
$page->load(['comments.createdBy']);
}
Views::add($page);
$this->setPageTitle($page->getShortName());
return view('pages/show', [
'page' => $page,'book' => $page->book,
'current' => $page, 'sidebarTree' => $sidebarTree,
'commentsEnabled' => $areCommentsEnabled,
'pageNav' => $pageNav]);
}