From 57c6adf465172fe1e93f4f087da4803f646fc040 Mon Sep 17 00:00:00 2001
From: Sabina Talipova <sabina.talipova@silverstripe.com>
Date: Mon, 7 Aug 2023 13:48:49 +1200
Subject: [PATCH] FIX Multi HTML entities in image shortcodes

---
 src/Shortcodes/ImageShortcodeProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shortcodes/ImageShortcodeProvider.php b/src/Shortcodes/ImageShortcodeProvider.php
index 0dd8064f..d4b5a9b4 100644
--- a/src/Shortcodes/ImageShortcodeProvider.php
+++ b/src/Shortcodes/ImageShortcodeProvider.php
@@ -156,7 +156,7 @@ public static function regenerate_shortcode($args, $content, $parser, $shortcode
         // Rebuild shortcode
         $parts = [];
         foreach ($args as $name => $value) {
-            $htmlValue = Convert::raw2att($value);
+            $htmlValue = htmlspecialchars($value ?? '', ENT_QUOTES, 'UTF-8', false);
             $parts[] = sprintf('%s="%s"', $name, $htmlValue);
         }
         return sprintf("[%s %s]", $shortcode, implode(' ', $parts));