mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-24 16:53:17 +00:00
Code Issues Releases Wiki Activity

Update ProfileController, fixes #788

Browse source
This commit is contained in:
Daniel Supernault 2019-01-17 13:27:14 -07:00
parent a0634b4476
commit 530b234f40
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
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

@ -187,7 +187,7 @@ class ProfileController extends Controller
return view('profile.private', compact('user', 'is_following')); return view('profile.private', compact('user', 'is_following'));
} }
} }
$followers = $profile->followers()->whereNull('status')->orderBy('created_at', 'desc')->simplePaginate(12); $followers = $profile->followers()->whereNull('status')->orderBy('followers.created_at', 'desc')->simplePaginate(12);
$is_admin = is_null($user->domain) ? $user->user->is_admin : false; $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
if ($user->remote_url) { if ($user->remote_url) {
$settings = new \StdClass; $settings = new \StdClass;
@ -217,7 +217,7 @@ class ProfileController extends Controller
return view('profile.private', compact('user', 'is_following')); return view('profile.private', compact('user', 'is_following'));
} }
} }
$following = $profile->following()->whereNull('status')->orderBy('created_at', 'desc')->simplePaginate(12); $following = $profile->following()->whereNull('status')->orderBy('followers.created_at', 'desc')->simplePaginate(12);
$is_admin = is_null($user->domain) ? $user->user->is_admin : false; $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
if ($user->remote_url) { if ($user->remote_url) {
$settings = new \StdClass; $settings = new \StdClass;