Merge remote-tracking branch 'upstream/2022.05-rc' into performance

This commit is contained in:
Michael 2022-05-03 08:23:09 +00:00
commit 4ba28e0199
38 changed files with 16540 additions and 3722 deletions

View file

@ -450,7 +450,7 @@ class Site extends BaseAdmin
$banner = DI::config()->get('system', 'banner');
if ($banner == false) {
$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
$banner = '<a href="https://friendi.ca"><img id="logo-img" width="32" height="32" src="images/friendica.svg" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
}
$email_banner = DI::config()->get('system', 'email_banner');