tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10812 from MrPetovan/bug/photo-route

Browse source 
Add missing Module\Photo route for post-media id with no customsize
This commit is contained in:
Michael Vogel 2021-10-03 14:01:53 +02:00 committed by GitHub
parent e10ab489a9 c84d4104e8
commit 3634009c0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Photo.php
View file

@ -98,8 +98,8 @@ class Photo extends BaseModule
} }
// Please refactor this for the love of everything that's good // Please refactor this for the love of everything that's good
if (!empty($parameters['contact_id'])) { if (!empty($parameters['id'])) {
$uid = $parameters['contact_id']; $uid = $parameters['id'];
} }
$photo = self::getAvatar($uid, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL); $photo = self::getAvatar($uid, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);

3
static/routes.config.php
View file

@ -372,10 +372,11 @@ return [
'/photo' => [ '/photo' => [
'/{name}' => [Module\Photo::class, [R::GET]], '/{name}' => [Module\Photo::class, [R::GET]],
'/{type}/{id:\d+}' => [Module\Photo::class, [R::GET]],
// User Id Fallback, to remove after version 2021.12 // User Id Fallback, to remove after version 2021.12
'/{type}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]], '/{type}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]],
'/{type}/{nickname_ext}' => [Module\Photo::class, [R::GET]], '/{type}/{nickname_ext}' => [Module\Photo::class, [R::GET]],
'/{type}/{customsize}/{contact_id:\d+}' => [Module\Photo::class, [R::GET]], '/{type}/{customsize}/{id:\d+}' => [Module\Photo::class, [R::GET]],
// User Id Fallback, to remove after version 2021.12 // User Id Fallback, to remove after version 2021.12
'/{type}/{customsize}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]], '/{type}/{customsize}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]],
'/{type}/{customsize}/{nickname_ext}' => [Module\Photo::class, [R::GET]], '/{type}/{customsize}/{nickname_ext}' => [Module\Photo::class, [R::GET]],