From a9d37975dc8f64ee7630fb72e9a58a38a4383504 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 5 May 2018 01:17:41 +0300 Subject: [PATCH] Themes: get templates from templates folder --- flextype/Themes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flextype/Themes.php b/flextype/Themes.php index fbcd9e96..3be27f58 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -78,10 +78,10 @@ class Themes { // Set view file // From current theme folder or from plugin folder - if (Filesystem::fileExists(THEMES_PATH . '/' . Config::get('site.theme') . '/templates/' . $template . View::$view_ext)) { - $template = THEMES_PATH . '/' . Config::get('site.theme') . '/templates/' . $template; + if (Filesystem::fileExists(THEMES_PATH . '/' . Config::get('site.theme') . '/views/' . $template . View::$view_ext)) { + $template = THEMES_PATH . '/' . Config::get('site.theme') . '/views/' . $template; } else { - $template = PLUGINS_PATH . '/' . $template; + $template = PLUGINS_PATH . '/views/' . $template; } // Return template