Merge branch 'v21.05.x'

diff --cc app/Theming/ThemeService.php
Simple merge

diff --cc app/Translation/FileLoader.php
Simple merge

diff --cc app/helpers.php
index 618c71bee1927a00563b44401e5114695a1549d9,a5a04f113dd240ec6daf977139598b84dba5838f..9edc22c403d9b1a7859baaec7983a8ad14e898a4
--- 1/app/helpers.php
--- 2/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));
  }
  
  /**

diff --cc composer.lock
Simple merge