Merge branch '2023.09-rc' into flip-replyto-link

This commit is contained in:
Jakobus Schürz 2023-10-11 02:07:47 +02:00
commit 08b45a32a5
1 changed files with 2 additions and 2 deletions

View File

@ -1012,7 +1012,7 @@ class Media
*/ */
public static function getPreviewUrlForId(int $id, string $size = ''): string public static function getPreviewUrlForId(int $id, string $size = ''): string
{ {
return '/photo/preview/' . return DI::baseUrl() . '/photo/preview/' .
(Proxy::getPixelsFromSize($size) ? Proxy::getPixelsFromSize($size) . '/' : '') . (Proxy::getPixelsFromSize($size) ? Proxy::getPixelsFromSize($size) . '/' : '') .
$id; $id;
} }
@ -1026,7 +1026,7 @@ class Media
*/ */
public static function getUrlForId(int $id, string $size = ''): string public static function getUrlForId(int $id, string $size = ''): string
{ {
return '/photo/media/' . return DI::baseUrl() . '/photo/media/' .
(Proxy::getPixelsFromSize($size) ? Proxy::getPixelsFromSize($size) . '/' : '') . (Proxy::getPixelsFromSize($size) ? Proxy::getPixelsFromSize($size) . '/' : '') .
$id; $id;
} }