UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-03 10:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #370 from pixelfed/frontend-ui-refactor

Browse source 
Update ProfileController
This commit is contained in:
daniel 2018-08-13 19:06:21 -06:00 committed by GitHub
commit 7c69c43dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/ProfileController.php
View file

@ -25,7 +25,7 @@ class ProfileController extends Controller
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
]; ];
if(in_array($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) { if(str_contains($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) {
return $this->showActivityPub($request, $user); return $this->showActivityPub($request, $user);
} }
if($user->is_private == true) { if($user->is_private == true) {
@ -58,7 +58,7 @@ class ProfileController extends Controller
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
]; ];
if(in_array($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) { if(str_contains($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) {
return $this->showActivityPub($request, $user); return $this->showActivityPub($request, $user);
} }