mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-07 12:34:39 +02:00
Merge remote-tracking branch 'upstream/develop' into unify-link
This commit is contained in:
commit
7c266be206
39 changed files with 537 additions and 315 deletions
|
@ -54,11 +54,10 @@ function message_init(App $a)
|
|||
'$tabs' => $tabs,
|
||||
'$new' => $new,
|
||||
]);
|
||||
$base = DI::baseUrl();
|
||||
|
||||
$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
|
||||
DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
|
||||
'$base' => $base
|
||||
'$base' => (string)DI::baseUrl()
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue