UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-20 20:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #571 from pixelfed/frontend-ui-refactor

Browse source 
Update ProfileController
This commit is contained in:
daniel 2018-11-19 23:46:32 -07:00 committed by GitHub
commit 3c5cf78eb8
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/ProfileController.php
View file

@ -152,7 +152,7 @@ class ProfileController extends Controller
$blocked = $this->blockedProfileCheck($profile); $blocked = $this->blockedProfileCheck($profile);
$check = $this->privateProfileCheck($profile, null); $check = $this->privateProfileCheck($profile, null);
if($check || $blocked) { if($check || $blocked) {
return view('profile.private', compact('user')); return view('profile.private', compact('user', 'is_following'));
} }
} }
$followers = $profile->followers()->orderBy('created_at', 'desc')->simplePaginate(12); $followers = $profile->followers()->orderBy('created_at', 'desc')->simplePaginate(12);
@ -176,7 +176,7 @@ class ProfileController extends Controller
$blocked = $this->blockedProfileCheck($profile); $blocked = $this->blockedProfileCheck($profile);
$check = $this->privateProfileCheck($profile, null); $check = $this->privateProfileCheck($profile, null);
if($check || $blocked) { if($check || $blocked) {
return view('profile.private', compact('user')); return view('profile.private', compact('user', 'is_following'));
} }
} }
$following = $profile->following()->orderBy('created_at', 'desc')->simplePaginate(12); $following = $profile->following()->orderBy('created_at', 'desc')->simplePaginate(12);