mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
Changed my mind :)
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
00f7cb9dbb
commit
36ae162626
|
@ -445,11 +445,7 @@ class UserPresenter extends Presenter
|
||||||
return Storage::disk('public')->url('avatars/'.e($this->avatar));
|
return Storage::disk('public')->url('avatars/'.e($this->avatar));
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there is a default avatar
|
|
||||||
if (Setting::getSettings()->default_avatar!= '') {
|
|
||||||
return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall back to Gravatar if the settings allow loading remote scripts
|
// Fall back to Gravatar if the settings allow loading remote scripts
|
||||||
if (Setting::getSettings()->load_remote == '1') {
|
if (Setting::getSettings()->load_remote == '1') {
|
||||||
if ($this->model->gravatar != '') {
|
if ($this->model->gravatar != '') {
|
||||||
|
@ -464,7 +460,10 @@ class UserPresenter extends Presenter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If there is a default avatar
|
||||||
|
if (Setting::getSettings()->default_avatar!= '') {
|
||||||
|
return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue