Fix formatting in Render/FriendicaSmarty*
This commit is contained in:
parent
99eb696386
commit
03c1f2cbf8
2 changed files with 5 additions and 1 deletions
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue