replace macros

implement new replaceMacros function
This commit is contained in:
Adam Magness 2018-10-31 10:35:50 -04:00
parent f6c86649c2
commit 91facd2d0a
91 changed files with 335 additions and 249 deletions

View file

@ -8,6 +8,7 @@ use Friendica\BaseModule;
use Friendica\BaseObject;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Util\Security;
@ -332,7 +333,7 @@ class Group extends BaseObject
$label = L10n::t('Default privacy group for new contacts');
}
$o = replace_macros(get_markup_template('group_selection.tpl'), [
$o = Renderer::replaceMacros(get_markup_template('group_selection.tpl'), [
'$label' => $label,
'$groups' => $display_groups
]);
@ -400,7 +401,7 @@ class Group extends BaseObject
}
$tpl = get_markup_template('group_side.tpl');
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$add' => L10n::t('add'),
'$title' => L10n::t('Groups'),
'$groups' => $display_groups,