simplify by making Smarty include directives behave like Friendica native ones

This commit is contained in:
Zach Prezkuta 2012-12-25 11:48:02 -07:00
commit 11c06e21b7
73 changed files with 376 additions and 587 deletions

View file

@ -66,13 +66,7 @@ function dispy_form(&$a, $font_size, $line_height, $colour) {
);
$t = get_markup_template("theme_settings.tpl" );
$includes = array(
'$field_select' => 'field_select.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($t, $includes + array(
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),

View file

@ -67,7 +67,7 @@
target="external-link">$profile.homepage</a></span>
</div>{{ endif }}
{{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
<div id="profile-extra-links">
<ul>