PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-25 14:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Check if user exists before checking redirect

Browse source
This commit is contained in:
Josef Citrine 2017-09-28 23:18:38 +01:00
parent 4dd8e4f038
commit 1f46b3a85d
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/Http/Controllers/ArtistsController.php
View file

@ -46,19 +46,23 @@ class ArtistsController extends Controller
{
$user = User::whereSlug($slug)->first();
if ($user->redirect_to) {
$newUser = User::find($user->redirect_to);
if ($user) {
if ($user->redirect_to) {
$newUser = User::find($user->redirect_to);
if ($newUser) {
return Redirect::action('ArtistsController@getProfile', [$newUser->slug]);
if ($newUser) {
return Redirect::action('ArtistsController@getProfile', [$newUser->slug]);
}
}
}
if ($user->disabled_at) {
if ($user->disabled_at) {
App::abort('404');
}
return View::make('artists.profile');
} else {
App::abort('404');
}
return View::make('artists.profile');
}
public function getShortlink($id)