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

Merge pull request #3195 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-01-28 23:23:43 -07:00 committed by GitHub
commit c909e9757a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/InternalApiController.php
View file

@ -323,6 +323,9 @@ class InternalApiController extends Controller
->simplePaginate(10) ->simplePaginate(10)
->map(function($bookmark) use($pid) { ->map(function($bookmark) use($pid) {
$status = StatusService::get($bookmark->status_id, false); $status = StatusService::get($bookmark->status_id, false);
if(!$status) {
return false;
}
$status['bookmarked_at'] = $bookmark->created_at->format('c'); $status['bookmarked_at'] = $bookmark->created_at->format('c');
if($status) { if($status) {

BIN
public/js/spa.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.