Closed tsmr closed 1 year ago
inc/simplepdf.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/simplepdf.class.php b/inc/simplepdf.class.php index 9693301..3ed5913 100644 --- a/inc/simplepdf.class.php +++ b/inc/simplepdf.class.php @@ -348,7 +348,7 @@ class PluginPdfSimplePDF { $this->setColumnsSize(100); $text = $name.' '.$content; - $content = Html::entity_decode_deep($text); + $content = Glpi\RichText\RichText::getTextFromHtml($text); if (!preg_match("/<br\s?\/?>/", $content) && !preg_match("/<p>/", $content)) { $content = nl2br($content); }
inc/document.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inc/document.class.php b/inc/document.class.php index 85bc8b3..936585c 100644 --- a/inc/document.class.php +++ b/inc/document.class.php @@ -78,6 +78,9 @@ class PluginPdfDocument extends PluginPdfCommon { $pdf->displayTitle(__('Name'), __('Entity'), __('File'), __('Web link'), __('Heading'), __('MIME type'), __('Tag'), __('Date')); foreach ($result as $data) { + if (empty($data["link"])) { + $data["link"] = ''; + } $pdf->displayLine($data["name"], $data['completename'], basename($data["filename"]), $data["link"], Dropdown::getDropdownName("glpi_documentcategories", $data["documentcategories_id"]), @@ -88,4 +91,4 @@ class PluginPdfDocument extends PluginPdfCommon { } $pdf->displaySpace(); } -} \ No newline at end of file +}
OK for document. KO for simplepdf without your patch with your patch
Done for document https://github.com/yllen/pdf/commit/d9e2c05f81c69ad27bf638c2026c04b100d253b2
@Tsmr no news? i close this?