friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix formatting in Render/FriendicaSmarty*

This commit is contained in:
Hypolite Petovan 2018-02-02 07:47:42 -05:00
parent 99eb696386
commit 03c1f2cbf8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Render/FriendicaSmarty.php
View File

@ -27,8 +27,10 @@ class FriendicaSmarty extends Smarty
// setTemplateDir can be set to an array, which Smarty will parse in order.
// The order is thus very important here
$template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"];
if (x($a->theme_info, "extends"))
if (x($a->theme_info, "extends")) {
$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];
}
$template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"];
$this->setTemplateDir($template_dirs);

2
src/Render/FriendicaSmartyEngine.php
View File

@ -41,6 +41,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
if ($key[0] === '$') {
$key = substr($key, 1);
}
$s->assign($key, $value);
}
return $s->parsed($template);
@ -52,6 +53,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
$template = new FriendicaSmarty();
$template->filename = $template_file;
return $template;
}
}