From 796eb1c8748a92171798bbeeaa8b5c310a3c1c1f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 11 Jul 2018 22:58:52 -0400 Subject: [PATCH] Fix undefined index in mod/settings --- mod/settings.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 34e9ce41ec..ff969d65eb 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -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; -- 2.39.5