chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #1853 from pixelfed/staging 

Fixes #1852
This commit is contained in:
daniel 2019-11-30 18:36:45 -07:00 committed by GitHub
parent 77f9f7fe67 67a90ee18d
commit b10295a17b
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/Api/BaseApiController.php
View File

@ -193,11 +193,11 @@ class BaseApiController extends Controller
]);
}
public function showTempMedia(Request $request, int $profileId, $mediaId, $timestamp)
public function showTempMedia(Request $request, $profileId, $mediaId, $timestamp)
{
abort_if(!$request->user(), 403);
abort_if(!$request->hasValidSignature(), 404);
abort_if(Auth::user()->profile_id !== $profileId, 404);
abort_if(Auth::user()->profile_id != $profileId, 404);
$media = Media::whereProfileId(Auth::user()->profile_id)->findOrFail($mediaId);
$path = storage_path('app/'.$media->media_path);
return response()->file($path);