lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-25 08:55:14 -08:00
commit 2105a1ec1d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Presenters/UserPresenter.php
View file

@ -301,7 +301,7 @@ class UserPresenter extends Presenter
*/ */
public function fullName() public function fullName()
{ {
return "{$this->first_name} {$this->last_name}"; return html_entity_decode($this->first_name.' '.$this->last_name, ENT_QUOTES | ENT_XML1, 'UTF-8');
} }
/** /**

2
resources/views/users/view.blade.php
View file

@ -2,7 +2,7 @@
{{-- Page title --}} {{-- Page title --}}
@section('title') @section('title')
{{ trans('admin/users/general.view_user', ['name' => html_entity_decode($user->present()->fullName(), ENT_QUOTES | ENT_XML1, 'UTF-8')]) }} {{ trans('admin/users/general.view_user', ['name' => $user->present()->fullName()]) }}
@parent @parent
@stop @stop