clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11730 from HankG/bugfix-frio-display-settings-error 

Fix frio settings display error setting scheme to custom type if null
This commit is contained in:
Hypolite Petovan 2022-07-13 08:50:23 -04:00 committed by GitHub
parent 1ca929ca36 74252b5a31
commit 5d8ebffb4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/theme/frio/php/scheme.php
View File

@ -42,7 +42,7 @@ function get_scheme_info($scheme)
$theme = DI::app()->getCurrentTheme(); $theme = DI::app()->getCurrentTheme();
$themepath = 'view/theme/' . $theme . '/'; $themepath = 'view/theme/' . $theme . '/';
if (empty($scheme)) { if (empty($scheme)) {
$scheme = DI::pConfig()->get(local_user(), 'frio', 'scheme', DI::pConfig()->get(local_user(), 'frio', 'schema')); $scheme = DI::pConfig()->get(local_user(), 'frio', 'scheme', DI::pConfig()->get(local_user(), 'frio', 'schema', '---'));
} }
$scheme = Strings::sanitizeFilePathItem($scheme); $scheme = Strings::sanitizeFilePathItem($scheme);
@ -56,7 +56,9 @@ function get_scheme_info($scheme)
'accented' => false, 'accented' => false,
]; ];
if (!is_file($themepath . 'scheme/' . $scheme . '.php')) return $info; if (!is_file($themepath . 'scheme/' . $scheme . '.php')) {
return $info;
}
$f = file_get_contents($themepath . 'scheme/' . $scheme . '.php'); $f = file_get_contents($themepath . 'scheme/' . $scheme . '.php');