yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix profile bookmarks

Browse source
This commit is contained in:
Daniel Supernault 2019-02-12 21:14:33 -07:00
parent e3760749ae
commit 46e2cece94
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 122 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -238,7 +238,7 @@ class ProfileController extends Controller
$timeline = $user->bookmarks()->withCount(['likes','comments'])->orderBy('created_at', 'desc')->simplePaginate(10);
$is_following = ($owner == false && Auth::check()) ? $user->followedBy(Auth::user()->profile) : false;
$is_admin = is_null($user->domain) ? $user->user->is_admin : false;
return view('profile.show', compact('user', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin'));
return view('profile.bookmarks', compact('user', 'profile', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin'));
}
public function createCollection(Request $request)