webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Merge branch 'v21.05.x'

Browse Source
This commit is contained in:
Dan Brown
2021-07-03 12:02:13 +01:00
parent f295ab87b4 b1ee1a856f
commit 1c43602f4b
4 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Theming/ThemeService.php
View File

@ -49,7 +49,7 @@ class ThemeService
public function readThemeActions()
{
$themeActionsFile = theme_path('functions.php');
if (file_exists($themeActionsFile)) {
if ($themeActionsFile && file_exists($themeActionsFile)) {
require $themeActionsFile;
}
}

6
app/Translation/FileLoader.php
View File

@ -24,9 +24,9 @@ class FileLoader extends BaseLoader
}
if (is_null($namespace) || $namespace === '*') {
$themeTranslations = $this->loadPath(theme_path('lang'), $locale, $group);
$originalTranslations = $this->loadPath($this->path, $locale, $group);
$themePath = theme_path('lang');
$themeTranslations = $themePath ? $this->loadPath($themePath, $locale, $group) : [];
$originalTranslations = $this->loadPath($this->path, $locale, $group);
return array_merge($originalTranslations, $themeTranslations);
}

6
app/helpers.php
View File

@ -99,13 +99,15 @@ function setting(string $key = null, $default = null)
/**
* Get a path to a theme resource.
* Returns null if a theme is not configured and
* therefore a full path is not available for use.
*/
function theme_path(string $path = ''): string
function theme_path(string $path = ''): ?string
{
$theme = config('view.theme');
if (!$theme) {
return '';
return null;
}
return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));