From: Dan Brown <redacted>
Date: Sat, 3 Jul 2021 11:02:13 +0000 (+0100)
Subject: Merge branch 'v21.05.x'
X-Git-Tag: v21.08~1^2~28
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1c43602f4bed60a84f47735ca8bc4a399018e013

Merge branch 'v21.05.x'
---

1c43602f4bed60a84f47735ca8bc4a399018e013
diff --cc app/helpers.php
index 618c71bee,a5a04f113..9edc22c40
--- a/app/helpers.php
+++ b/app/helpers.php
@@@ -105,10 -102,10 +107,10 @@@ function theme_path(string $path = '')
      $theme = config('view.theme');
  
      if (!$theme) {
-         return '';
+         return null;
      }
  
 -    return base_path('themes/' . $theme .($path ? DIRECTORY_SEPARATOR.$path : $path));
 +    return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));
  }
  
  /**