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

Merge branch '2024.09-rc' into merge-2024.09-rc-into-develop

Browse source
This commit is contained in:
Art4 2024-12-07 15:40:08 +00:00
commit 1c43d57233
8 changed files with 2164 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Module/OpenSearch.php
View file

@ -14,6 +14,7 @@ use Friendica\BaseModule;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Util\BasePath;
use Friendica\Util\Network;
use Friendica\Util\Profiler;
use Friendica\Util\XML;
use Psr\Log\LoggerInterface;
@ -68,11 +69,12 @@ class OpenSearch extends BaseModule
}
if (!empty($shortcut_icon)) {
$imagedata = getimagesize($this->baseUrl . $shortcut_icon);
$shortcut_icon = Network::addBasePath($shortcut_icon, $this->baseUrl);
$imagedata = getimagesize($shortcut_icon);
}
if (!empty($imagedata)) {
XML::addElement($xml, $parent, 'Image', $this->baseUrl . $shortcut_icon, [
XML::addElement($xml, $parent, 'Image', $shortcut_icon, [
'width' => $imagedata[0],
'height' => $imagedata[1],
'type' => $imagedata['mime'],