]> git.mxchange.org Git - friendica.git/commitdiff
Fix undefined index in mod/settings
authorHypolite Petovan <mrpetovan@gmail.com>
Thu, 12 Jul 2018 02:58:52 +0000 (22:58 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Mon, 16 Jul 2018 23:38:18 +0000 (19:38 -0400)
mod/settings.php

index 34e9ce41ec0f7e780e403f5d6ad190b25396e7f8..ff969d65eb24d8654f98df9197498ec02a4c3890 100644 (file)
@@ -26,14 +26,12 @@ use Friendica\Util\Temporal;
 function get_theme_config_file($theme)
 {
        $a = get_app();
-       if (!empty($a->theme_info['extends'])) {
-               $base_theme = $a->theme_info['extends'];
-       }
+       $base_theme = defaults($a->theme_info, 'extends');
 
        if (file_exists("view/theme/$theme/config.php")) {
                return "view/theme/$theme/config.php";
        }
-       if (!empty($base_theme) && file_exists("view/theme/$base_theme/config.php")) {
+       if ($base_theme && file_exists("view/theme/$base_theme/config.php")) {
                return "view/theme/$base_theme/config.php";
        }
        return null;