diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index b9d539c069..3ab4a80aa6 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -301,7 +301,7 @@ class UserPresenter extends Presenter */ 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'); } /** diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 852d3a3d80..bb78164748 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -2,7 +2,7 @@ {{-- Page 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 @stop