diff --git a/inc/ticket.class.php b/inc/ticket.class.php index 17adb726d34..cc2ff580314 100644 --- a/inc/ticket.class.php +++ b/inc/ticket.class.php @@ -6439,9 +6439,26 @@ function showTimeline($rand) { echo "
"; echo "
".Html::convDateTime($this->fields['date'])."
"; echo "
"; - if (isset($item_i['users_id_recipient']) - && ($item_i['users_id_recipient'] != 0)) { - $user->getFromDB($this->fields['users_id_recipient']); + $dem = '0'; + foreach ($DB->request("glpi_tickets_users", + "`tickets_id` = ".$this->fields['id']." AND `type` = 1") AS $req) { + $dem = $req['users_id']; + } + if ((!isset($item_i['users_id_recipient']) + || ($item_i['users_id_recipient'] == 0)) + && ($dem == 0)) { + _e("Requester"); + } + else { + if (isset($item_i['users_id_recipient']) + && ($item_i['users_id_recipient'] != 0)) { + $user->getFromDB($this->fields['users_id_recipient']); + } else if ($dem > 0) { + $requester = new User(); + if ($requester->getFromDB($dem)) { + $user = $requester; + } + } echo "
"; $picture = ""; @@ -6453,8 +6470,6 @@ function showTimeline($rand) { echo "
"; echo $user->getLink(); - } else { - _e("Requester"); } echo "
"; // h_user