Merge pull request #7882 from hoergen/Plusminus

[friendica.git] / view / theme / frio / php / scheme.php

diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index ddce673105e473320879d57b2ae066746f0753e5..fa933bd9411a1b28b8df9b57a6d259cfd2d42b2b 100644 (file)
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -17,13 +17,19 @@
  *    'version' => Scheme version
  *    'overwrites' => Variables which overwriting custom settings
  */
+
 use Friendica\Core\PConfig;
+use Friendica\Util\Strings;
 
 function get_scheme_info($scheme)
 {
-       $theme = get_app()->getCurrentTheme();
+       $theme = \get_app()->getCurrentTheme();
        $themepath = 'view/theme/' . $theme . '/';
-       $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
+       if (empty($scheme)) {
+               $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));
+       }
+
+       $scheme = Strings::sanitizeFilePathItem($scheme);
 
        $info = [
                'name' => $scheme,