From f475bdbb2da1a6d41714004c9cba0567f68983dc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 25 Nov 2020 08:54:23 -0800
Subject: [PATCH] Fixed #8797 - use html_entity_decode in fullName presenter
 for User

---
 app/Presenters/UserPresenter.php     | 2 +-
 resources/views/users/view.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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