From abecb1523292bdfbbbf0e7606bb3976d50f318d0 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 5 Jun 2016 09:53:08 +0930 Subject: [PATCH] Display header HTML in layout rather than app wrapper This is so a custom layout can opt-out of displaying header HTML (e.g. embed extension) --- framework/core/views/admin.blade.php | 2 ++ framework/core/views/app.blade.php | 2 -- framework/core/views/forum.blade.php | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/core/views/admin.blade.php b/framework/core/views/admin.blade.php index 47275da32..80a0856a8 100644 --- a/framework/core/views/admin.blade.php +++ b/framework/core/views/admin.blade.php @@ -1,3 +1,5 @@ +{!! array_get($forum, 'attributes.headerHtml') !!} +
diff --git a/framework/core/views/app.blade.php b/framework/core/views/app.blade.php index 6543c8b5d..ff4187de4 100644 --- a/framework/core/views/app.blade.php +++ b/framework/core/views/app.blade.php @@ -19,8 +19,6 @@ - {!! array_get($forum, 'attributes.headerHtml') !!} - {!! $layout !!} diff --git a/framework/core/views/forum.blade.php b/framework/core/views/forum.blade.php index ec53712d0..0d22ebb93 100644 --- a/framework/core/views/forum.blade.php +++ b/framework/core/views/forum.blade.php @@ -21,6 +21,8 @@ * - #composer */ ?> +{!! array_get($forum, 'attributes.headerHtml') !!} +