Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 18:30:12 +00: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

5
src/Module/Login.php
View file

@ -11,6 +11,7 @@ use Friendica\Core\Authentication;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\User;
@ -301,7 +302,7 @@ class Login extends BaseModule
if (local_user()) {
$tpl = get_markup_template('logout.tpl');
} else {
$a->page['htmlhead'] .= replace_macros(
$a->page['htmlhead'] .= Renderer::replaceMacros(
get_markup_template('login_head.tpl'),
[
'$baseurl' => $a->getBaseURL(true)
@ -312,7 +313,7 @@ class Login extends BaseModule
$_SESSION['return_path'] = $return_path;
}
$o .= replace_macros(
$o .= Renderer::replaceMacros(
$tpl,
[
'$dest_url' => self::getApp()->getBaseURL(true) . '/login',