Merge fixes from branch 'v0.12'

[bookstack] / resources / views / base.blade.php

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 961ead251bfdd79f9f886ed43639228c7e0d9da2..08acf725d95ea013b54fcd0742060d87e9d571ed 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -39,7 +39,9 @@
                         @if(setting('app-logo', '') !== 'none')
                             <img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
                         @endif
-                        <span class="logo-text">{{ setting('app-name') }}</span>
+                        @if (setting('app-name-header'))
+                            <span class="logo-text">{{ setting('app-name') }}</span>
+                        @endif
                     </a>
                 </div>
                 <div class="col-lg-4 col-sm-3 text-center">