Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 15:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove duplicate $baseurl template variable

Browse source 
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
This commit is contained in:
Hypolite Petovan 2019-04-27 22:18:30 -04:00
parent d8125eb3db
commit 9774c95b80
41 changed files with 38 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Core/Renderer.php
View file

@ -52,22 +52,20 @@ class Renderer extends BaseObject
/**
* @brief This is our template processor
*
* @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty
* @param array $vars key value pairs (search => replace)
* @param bool $overwriteURL Overwrite the base url with the system wide set base url
* @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty
* @param array $vars Key value pairs (search => replace)
*
* @return string substituted string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws Exception
*/
public static function replaceMacros($s, $vars, $overwriteURL = true)
public static function replaceMacros($s, array $vars = [])
{
$stamp1 = microtime(true);
$a = self::getApp();
// pass $baseurl to all templates
if ($overwriteURL) {
$vars['$baseurl'] = System::baseUrl();
}
// pass $baseurl to all templates if it isn't set
$vars = array_merge(['$baseurl' => $a->getBaseURL()], $vars);
$t = self::getTemplateEngine();
try {