From 348203d23834bf52e1e18a4eb709cbc38a03f0fe Mon Sep 17 00:00:00 2001 From: John Rallis Date: Wed, 29 Nov 2023 15:13:51 +0200 Subject: [PATCH 1/2] fix when otherserial is null --- inc/change_item.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/change_item.class.php b/inc/change_item.class.php index f708490..d7751bf 100644 --- a/inc/change_item.class.php +++ b/inc/change_item.class.php @@ -119,13 +119,13 @@ static function pdfForChange(PluginPdfSimplePDF $pdf, Change $change) { Toolbox::stripTags($name), Dropdown::getDropdownName("glpi_entities", $data['entity']), Toolbox::stripTags($data["serial"]), - Toolbox::stripTags($data["otherserial"]),$nb); + Toolbox::stripTags((string)$data["otherserial"]),$nb); } else { $pdf->displayLine('', Toolbox::stripTags($name), Dropdown::getDropdownName("glpi_entities", $data['entity']), Toolbox::stripTags($data["serial"]), - Toolbox::stripTags($data["otherserial"]),$nb); + Toolbox::stripTags((string)$data["otherserial"]),$nb); } $prem = false; } From 0f4553dee684fc8ad09021d43a2d76fd694c1ac1 Mon Sep 17 00:00:00 2001 From: John Rallis Date: Tue, 16 Jul 2024 17:26:40 +0300 Subject: [PATCH 2/2] stringify "serial" as well --- inc/change_item.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/change_item.class.php b/inc/change_item.class.php index d7751bf..5e59e3b 100644 --- a/inc/change_item.class.php +++ b/inc/change_item.class.php @@ -118,13 +118,13 @@ static function pdfForChange(PluginPdfSimplePDF $pdf, Change $change) { $pdf->displayLine(Toolbox::stripTags(sprintf(__('%1$s: %2$s'), $typename, $nb)), Toolbox::stripTags($name), Dropdown::getDropdownName("glpi_entities", $data['entity']), - Toolbox::stripTags($data["serial"]), + Toolbox::stripTags((string)$data["serial"]), Toolbox::stripTags((string)$data["otherserial"]),$nb); } else { $pdf->displayLine('', Toolbox::stripTags($name), Dropdown::getDropdownName("glpi_entities", $data['entity']), - Toolbox::stripTags($data["serial"]), + Toolbox::stripTags((string)$data["serial"]), Toolbox::stripTags((string)$data["otherserial"]),$nb); } $prem = false;