From a12686ac803d15d742e4e6cde5300112177b2faf Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 24 Jun 2017 12:16:00 +0200 Subject: [PATCH] Flarum\Frontend: Fix view paths after renaming namespace --- framework/core/src/Frontend/AbstractFrontend.php | 4 ++-- framework/core/src/Frontend/FrontendView.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/core/src/Frontend/AbstractFrontend.php b/framework/core/src/Frontend/AbstractFrontend.php index d556e81b8..af4fc954e 100644 --- a/framework/core/src/Frontend/AbstractFrontend.php +++ b/framework/core/src/Frontend/AbstractFrontend.php @@ -86,7 +86,7 @@ abstract class AbstractFrontend */ protected function getLayout() { - return __DIR__.'/../../../views/'.$this->getName().'.blade.php'; + return __DIR__.'/../../views/'.$this->getName().'.blade.php'; } /** @@ -104,7 +104,7 @@ abstract class AbstractFrontend */ private function addDefaultAssets(FrontendView $view) { - $root = __DIR__.'/../../..'; + $root = __DIR__.'/../..'; $name = $this->getName(); $view->getJs()->addFile("$root/js/$name/dist/app.js"); diff --git a/framework/core/src/Frontend/FrontendView.php b/framework/core/src/Frontend/FrontendView.php index f564443ea..0593e070a 100644 --- a/framework/core/src/Frontend/FrontendView.php +++ b/framework/core/src/Frontend/FrontendView.php @@ -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->file(__DIR__.'/../../views/app.blade.php'); $view->title = $this->buildTitle(array_get($forum, 'data.attributes.title')); $view->description = $this->description ?: array_get($forum, 'data.attributes.description'); @@ -345,7 +345,7 @@ class FrontendView protected function buildContent() { - $view = $this->view->file(__DIR__.'/../../../views/content.blade.php'); + $view = $this->view->file(__DIR__.'/../../views/content.blade.php'); $view->content = $this->content;