X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0775cd09a152c6e05c100139812f1fc35cb1ac6a..refs/pull/358/head:/resources/views/base.blade.php diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index b1c74fbd0..4287014c2 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -17,14 +17,16 @@ + @yield('head') @include('partials/custom-styles') - - @if(setting('app-custom-head')) + @if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings') + {!! setting('app-custom-head') !!} + @endif @@ -54,15 +56,15 @@

{{ trans('entities.books') }} - @if(isset($currentUser) && userCan('settings-manage')) + @if(signedInUser() && userCan('settings-manage')) {{ trans('settings.settings') }} @endif - @if(!isset($signedIn) || !$signedIn) + @if(!signedInUser()) {{ trans('auth.log_in') }} @endif

- @if(isset($signedIn) && $signedIn) - @include('partials._header-dropdown', ['currentUser' => $currentUser]) + @if(signedInUser()) + @include('partials._header-dropdown', ['currentUser' => user()]) @endif