mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-11 23:14:29 +02:00
Code Issues Releases Wiki Activity

merges 5.5 and master into next-back

Browse Source
This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
parent 93aa3d77b5 c6ce172caa
commit f65e4dcba3
104 changed files with 1723 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Frontend/FrontendView.php
View File

@@ -287,7 +287,7 @@ class FrontendView
$this->view->share('forum', array_get($forum, 'data'));
$this->view->share('debug', $this->app->inDebugMode());
$view = $this->view->file(__DIR__.'/../../views/app.blade.php');
$view = $this->view->make('flarum.forum::app');
$view->title = $this->buildTitle(array_get($forum, 'data.attributes.title'));
$view->description = $this->description ?: array_get($forum, 'data.attributes.description');
@@ -336,7 +336,7 @@ class FrontendView
protected function buildLayout()
{
$view = $this->view->file($this->layout);
$view = $this->view->make($this->layout);
$view->content = $this->buildContent();
@@ -345,7 +345,7 @@ class FrontendView
protected function buildContent()
{
$view = $this->view->file(__DIR__.'/../../views/content.blade.php');
$view = $this->view->make('flarum.forum::content');
$view->content = $this->content;