Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 05:04:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

replace macros

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
src/Util/Temporal.php
View file

@ -11,6 +11,7 @@ use DateTimeZone;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
require_once 'boot.php';
@ -115,7 +116,7 @@ class Temporal
$options = str_replace('</select>', '', $options);
$tpl = get_markup_template('field_select_raw.tpl');
return replace_macros($tpl, [
return Renderer::replaceMacros($tpl, [
'$field' => [$name, $label, $current, $help, $options],
]);
}
@ -141,7 +142,7 @@ class Temporal
$age = (intval($value) ? self::getAgeByTimezone($value, $a->user["timezone"], $a->user["timezone"]) : "");
$tpl = get_markup_template("field_input.tpl");
$o = replace_macros($tpl,
$o = Renderer::replaceMacros($tpl,
[
'$field' => [
'dob',
@ -247,7 +248,7 @@ class Temporal
$readable_format = str_replace(['Y', 'm', 'd', 'H', 'i'], ['yyyy', 'mm', 'dd', 'HH', 'MM'], $dateformat);
$tpl = get_markup_template('field_datetime.tpl');
$o .= replace_macros($tpl, [
$o .= Renderer::replaceMacros($tpl, [
'$field' => [
$id,
$label,