UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-26 00:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1766 from pixelfed/staging

Browse source 
Update ApiController, fixes #1764
This commit is contained in:
daniel 2019-10-05 23:35:57 -06:00 committed by GitHub
commit a7128839a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -1447,9 +1447,7 @@ class ApiV1Controller extends Controller
$prev = $page > 1 ? $page - 1 : 1; $prev = $page > 1 ? $page - 1 : 1;
$links = '<'.$url.'?page='.$next.'&limit='.$limit.'>; rel="next", <'.$url.'?page='.$prev.'&limit='.$limit.'>; rel="prev"'; $links = '<'.$url.'?page='.$next.'&limit='.$limit.'>; rel="next", <'.$url.'?page='.$prev.'&limit='.$limit.'>; rel="prev"';
return response() return response()->json($res, 200, ['Link' => $links]);
->header('Link', $links)
->json($res);
} }
/** /**
@ -1480,9 +1478,7 @@ class ApiV1Controller extends Controller
$prev = $page > 1 ? $page - 1 : 1; $prev = $page > 1 ? $page - 1 : 1;
$links = '<'.$url.'?page='.$next.'&limit='.$limit.'>; rel="next", <'.$url.'?page='.$prev.'&limit='.$limit.'>; rel="prev"'; $links = '<'.$url.'?page='.$next.'&limit='.$limit.'>; rel="next", <'.$url.'?page='.$prev.'&limit='.$limit.'>; rel="prev"';
return response() return response()->json($res, 200, ['Link' => $links]);
->header('Link', $links)
->json($res);
} }
/** /**