Fix: Preserve Redirection Links for Images in Emails #18397
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Maybe a new test should be added (instead of update it) to test the regex format (permissive now) To test that it accepts any type of content before or after <a href="example.com">
<span>Balise imbriquée</span>
<img src="image.jpg" alt="Image" class="tag-class" />
</a><a href="example.com">
Une image simple
<img src="image.jpg" alt="Image" class="tag-class" />
Plus de texte ici
</a><a href="example.com">
<div>
Contenu complexe
<img src="image.jpg" class="tag-class" />
</div>
</a> |
|
I'm not sure I understand this fix... It talks about keeping redireciton link, and tests was adapted to drop one :D Also, it seems the previous fix was successfully used by the customer; is this the same case as the "original" one? |
cedric-anne
requested changes
Dec 2, 2024
stonebuzz
suggested changes
Dec 6, 2024
| @@ -943,7 +943,7 @@ public function testConvertTagToImageAlreadyInLink() | |||
| $expected_result = <<<HTML | |||
| Some contents with <a href="http://example.org/">a link</a> | |||
| and a first image <a href="{$expected_url_1}" target="_blank"><img alt="{$img_1_tag}" width="10" src="{$image_1_src}" /></a> inside a link | |||
| then a second image surrounded by links <a href="http://www.example.org/">link1</a> <a href="{$image_2_src}" target="_blank" ><img alt="{$img_2_tag}" width="10" src="{$image_2_src}" /></a> <a href="http://www.example.org/2">link2</a> | |||
| then a second image surrounded by links <a href="http://www.example.org/">link1</a> <img alt="{$img_2_tag}" width="10" src="{$image_2_src}" /> <a href="http://www.example.org/2">link2</a> | |||
There was a problem hiding this comment.
Suggested change
| then a second image surrounded by links <a href="http://www.example.org/">link1</a> <img alt="{$img_2_tag}" width="10" src="{$image_2_src}" /> <a href="http://www.example.org/2">link2</a> | |
| then a second image surrounded by links <a href="http://www.example.org/">link1</a> <a href="{$image_2_src}" target="_blank" ><img alt="{$img_2_tag}" width="10" src="{$image_2_src}" /></a> <a href="http://www.example.org/2">link2</a> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
It fixes !35308
This PR fixes an issue where the redirect link associated with an image sent via the GLPI collector was removed. When someone sent an image with a redirect link, the link was deleted, preventing the redirect from working. Therefore, in a ticket when t-one clicked on the image, GLPI redirected us to it and not to the URL that was associated with it.