From f58fc1a6279eb19633a7ebae159b40651a9b0844 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Wed, 27 Nov 2024 16:50:37 +0100 Subject: [PATCH 1/2] Fix: Preserve Redirection Links for Images in Emails --- src/Toolbox.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Toolbox.php b/src/Toolbox.php index ac3c12f66ea..886d3c5a959 100644 --- a/src/Toolbox.php +++ b/src/Toolbox.php @@ -2815,7 +2815,7 @@ public static function convertTagToImage($content_text, CommonDBTM $item, $doc_d // Avoids creating a link within a link, when the image is already in an tag $add_link_tmp = $add_link; if ($add_link) { - $pattern = '/]*>[^<>]*?]+' . preg_quote($image['tag'], '/') . '[^<]+>[^<>]*?<\/a>/s'; + $pattern = '/]*>.*?]*' . preg_quote($image['tag'], '/') . '[^>]*>.*?<\/a>/s'; if (preg_match($pattern, $content_text)) { $add_link_tmp = false; } From 8b7433ef01762c240b3b4910b974430d61ca7858 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Thu, 28 Nov 2024 10:16:43 +0100 Subject: [PATCH 2/2] Modif test --- phpunit/functional/ToolboxTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit/functional/ToolboxTest.php b/phpunit/functional/ToolboxTest.php index 9716bf0f01f..4532367fb46 100644 --- a/phpunit/functional/ToolboxTest.php +++ b/phpunit/functional/ToolboxTest.php @@ -943,7 +943,7 @@ public function testConvertTagToImageAlreadyInLink() $expected_result = <<a link and a first image {$img_1_tag} inside a link - then a second image surrounded by links link1 {$img_2_tag} link2 + then a second image surrounded by links link1 {$img_2_tag} link2 HTML; $docs_data = [