Merge remote-tracking branch 'upstream/develop' into issue-4816

[friendica.git] / src / Render / FriendicaSmartyEngine.php

diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index 6fd51cf5d1a9e307920e980dc3b9cc11c1b11d19..949ac58c82d1f4b1a82c9babeac4acc1a7ea512e 100644 (file)
--- a/src/Render/FriendicaSmartyEngine.php
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -6,8 +6,11 @@ namespace Friendica\Render;
 
 use Friendica\Core\Addon;
 
-define('SMARTY3_TEMPLATE_FOLDER', 'templates');
-
+/**
+ * Smarty implementation of the Friendica template engine interface
+ *
+ * @author Hypolite Petovan <mrpetovan@gmail.com>
+ */
 class FriendicaSmartyEngine implements ITemplateEngine
 {
        static $name = "smarty3";
@@ -52,8 +55,26 @@ class FriendicaSmartyEngine implements ITemplateEngine
        public function getTemplateFile($file, $root = '')
        {
                $a = get_app();
-               $template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
                $template = new FriendicaSmarty();
+
+               // Make sure $root ends with a slash /
+               if ($root !== '' && substr($root, -1, 1) !== '/') {
+                       $root = $root . '/';
+               }
+
+               $theme = current_theme();
+               $filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file;
+
+               if (file_exists("{$root}view/theme/$theme/$filename")) {
+                       $template_file = "{$root}view/theme/$theme/$filename";
+               } elseif (x($a->theme_info, 'extends') && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename))) {
+                       $template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename);
+               } elseif (file_exists("{$root}/$filename")) {
+                       $template_file = "{$root}/$filename";
+               } else {
+                       $template_file = "{$root}view/$filename";
+               }
+
                $template->filename = $template_file;
 
                return $template;