From f93431b43ef1e8211b6f00361d9399bf0383451b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 27 Feb 2017 10:44:50 +0100 Subject: do not mess up schemas --- Zotlabs/Render/Theme.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Render/Theme.php') diff --git a/Zotlabs/Render/Theme.php b/Zotlabs/Render/Theme.php index 7464a0db2..71eef50c3 100644 --- a/Zotlabs/Render/Theme.php +++ b/Zotlabs/Render/Theme.php @@ -69,16 +69,18 @@ class Theme { if(array_key_exists('theme_preview',$_GET)) $chosen_theme = $_GET['theme_preview']; + + + // Allow theme selection of the form 'theme_name:schema_name' + $themepair = explode(':', $chosen_theme); + // Check if $chosen_theme is compatible with core. If not fall back to default - $info = get_theme_info($chosen_theme); + $info = get_theme_info($themepair[0]); $compatible = check_plugin_versions($info); if(!$compatible) { $chosen_theme = ''; } - // Allow theme selection of the form 'theme_name:schema_name' - $themepair = explode(':', $chosen_theme); - if($chosen_theme && (file_exists('view/theme/' . $themepair[0] . '/css/style.css') || file_exists('view/theme/' . $themepair[0] . '/php/style.php'))) { return($themepair); } -- cgit v1.2.3