From 081be6ea8919a9f57ec0659ea11ab0e0c4b0b8ee Mon Sep 17 00:00:00 2001 From: Thomas Hufschmidt Date: Mon, 25 Nov 2024 15:38:06 +0100 Subject: [PATCH 1/2] Fix indentation for upcoming fix --- classes/class.ilObjComment.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/classes/class.ilObjComment.php b/classes/class.ilObjComment.php index 9f7b931db..608f7d141 100644 --- a/classes/class.ilObjComment.php +++ b/classes/class.ilObjComment.php @@ -342,22 +342,22 @@ public static function getUserImageInBase64(int $user_id) : string } public static function lookupUsername(int $user_id) : string - { + { if(!array_key_exists($user_id, self::$user_name_cache)) { - $user_obj_exists = ilObjUser::_exists($user_id, false, 'usr'); - $user_has_login = ilObjUser::_lookupLogin($user_id); - if($user_obj_exists && $user_has_login) { - $user = new ilObjUser($user_id); - if($user->hasPublicProfile()) - { - self::$user_name_cache[$user_id] = $user->getFirstname() . ' ' . $user->getLastname(); - } - else - { - self::$user_name_cache[$user_id] = '[' . $user->getLogin() . ']'; - } - } + $user_obj_exists = ilObjUser::_exists($user_id, false, 'usr'); + $user_has_login = ilObjUser::_lookupLogin($user_id); + if($user_obj_exists && $user_has_login) { + $user = new ilObjUser($user_id); + if($user->hasPublicProfile()) + { + self::$user_name_cache[$user_id] = $user->getFirstname() . ' ' . $user->getLastname(); + } + else + { + self::$user_name_cache[$user_id] = '[' . $user->getLogin() . ']'; + } + } } return self::$user_name_cache[$user_id]; From f88bef8e94e1aab90a58a261d664171a03183091 Mon Sep 17 00:00:00 2001 From: Thomas Hufschmidt Date: Mon, 25 Nov 2024 15:41:31 +0100 Subject: [PATCH 2/2] Fix username lookup for comment of deleted user --- classes/class.ilObjComment.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/class.ilObjComment.php b/classes/class.ilObjComment.php index 608f7d141..78beb9b87 100644 --- a/classes/class.ilObjComment.php +++ b/classes/class.ilObjComment.php @@ -357,6 +357,9 @@ public static function lookupUsername(int $user_id) : string { self::$user_name_cache[$user_id] = '[' . $user->getLogin() . ']'; } + } else { + global $lng; + self::$user_name_cache[$user_id] = '[' . $lng->txt('deleted') . ']'; } }