From 55ec291650f19bb2283f87dfc51849522efa836c Mon Sep 17 00:00:00 2001 From: celestora Date: Mon, 14 Nov 2022 16:47:34 +0200 Subject: [PATCH] Allow __transNames to be empty --- Web/Models/Entities/User.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index b7516c90..e64da5af 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -148,7 +148,8 @@ class User extends RowModel function getFirstName(bool $pristine = false): string { $name = ($this->isDeleted() && !$this->isDeactivated() ? "DELETED" : mb_convert_case($this->getRecord()->first_name, MB_CASE_TITLE)); - if((($ts = tr("__transNames")) !== "@__transNames") && !$pristine) + $tsn = tr("__transNames"); + if(( $tsn !== "@__transNames" && !empty($tsn) ) && !$pristine) return mb_convert_case(transliterator_transliterate($ts, $name), MB_CASE_TITLE); else return $name; @@ -157,7 +158,8 @@ class User extends RowModel function getLastName(bool $pristine = false): string { $name = ($this->isDeleted() && !$this->isDeactivated() ? "DELETED" : mb_convert_case($this->getRecord()->last_name, MB_CASE_TITLE)); - if((($ts = tr("__transNames")) !== "@__transNames") && !$pristine) + $tsn = tr("__transNames"); + if(( $tsn !== "@__transNames" && !empty($tsn) ) && !$pristine) return mb_convert_case(transliterator_transliterate($ts, $name), MB_CASE_TITLE); else return $name;