From 3f76034c5666f318557ce83b9f0ea7a89303080b Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 14 May 2018 23:35:05 +0300 Subject: [PATCH] Themes fixes --- flextype/Themes.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flextype/Themes.php b/flextype/Themes.php index 457cc320..4040358e 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -51,12 +51,13 @@ class Themes // Get current theme $theme = Registry::get('site.theme'); - // Set empty theme item - Registry::set('theme', []); + // Set empty themes items + Registry::set('themes', []); // Create Unique Cache ID for Theme $theme_cache_id = md5('theme' . THEMES_PATH . $theme); + // Get Theme mafifest file and write to site.themes array if (Cache::driver()->contains($theme_cache_id)) { Registry::set('themes.'.Registry::get('site.theme'), Cache::driver()->fetch($theme_cache_id)); } else { @@ -84,7 +85,7 @@ class Themes if (Filesystem::fileExists(THEMES_PATH . '/' . Registry::get('site.theme') . '/views/' . $template . View::$view_ext)) { $template = THEMES_PATH . '/' . Registry::get('site.theme') . '/views/' . $template; } else { - $template = PLUGINS_PATH . '/views/' . $template; + $template = PLUGINS_PATH . '/' . $template; } // Return template