From 6044894ebd9de9065dc2fbccf380787342d4dc71 Mon Sep 17 00:00:00 2001 From: magnus Ullberg Date: Sun, 10 Jun 2018 11:26:20 +0000 Subject: [PATCH] Only include the trianglify JS when enabled. --- app/Providers/AppServiceProvider.php | 4 ++-- resources/views/app.blade.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 4edf56c5..c9a068bc 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -17,7 +17,7 @@ class AppServiceProvider extends ServiceProvider public function boot() { $alt_bg = ''; - $trianglify = ''; + $trianglify = 'false'; if(!is_file(base_path('.env'))) { touch(base_path('.env')); @@ -34,7 +34,7 @@ class AppServiceProvider extends ServiceProvider if(is_file(database_path('app.sqlite'))) { if(Schema::hasTable('settings')) { if(Setting::fetch('trianglify')) { - $trianglify = ''; + $trianglify = 'true'; } else if($bg_image = Setting::fetch('background_image')) { $alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"'; } diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index 55d015da..cdcb0438 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -91,6 +91,7 @@ + @if ($trianglify == 'true') - {!! $trianglify !!} + + @endif @yield('scripts')