From fd33b5fa20827e0dcbdbadd15ce418186c41b857 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Fri, 2 Sep 2022 18:42:35 +0200
Subject: [PATCH] [JENKINS-68805] Reset cached attributes with ampersand as
 well (#6989)

---
 .../src/main/java/org/jenkins/ui/icon/IconSet.java | 14 +++++++-------
 .../jenkins/ui/icon/IconSetJenkins68805Test.java   |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java
index 9ac7a41bd5..5542e3e4c1 100644
--- a/core/src/main/java/org/jenkins/ui/icon/IconSet.java
+++ b/core/src/main/java/org/jenkins/ui/icon/IconSet.java
@@ -93,9 +93,9 @@ public class IconSet {
 
         if (symbolsForLookup.containsKey(translatedName)) {
             String symbol = symbolsForLookup.get(translatedName);
-            symbol = symbol.replaceAll("(class=\")[^&]*?(\")", "$1$2");
-            symbol = symbol.replaceAll("(tooltip=\")[^&]*?(\")", "");
-            symbol = symbol.replaceAll("(id=\")[^&]*?(\")", "");
+            symbol = symbol.replaceAll("(class=\").*?(\")", "$1$2");
+            symbol = symbol.replaceAll("(tooltip=\").*?(\")", "");
+            symbol = symbol.replaceAll("(id=\").*?(\")", "");
             if (!tooltip.isEmpty()) {
                 symbol = symbol.replaceAll("<svg", "<svg tooltip=\"" + Functions.htmlAttributeEscape(tooltip) + "\"");
             }
@@ -121,10 +121,10 @@ public class IconSet {
             symbol = PLACEHOLDER_SVG;
         }
 
-        symbol = symbol.replaceAll("(<title>)[^&]*(</title>)", "$1$2");
-        symbol = symbol.replaceAll("(class=\")[^&]*?(\")", "$1$2");
-        symbol = symbol.replaceAll("(tooltip=\")[^&]*?(\")", "$1$2");
-        symbol = symbol.replaceAll("(id=\")[^&]*?(\")", "");
+        symbol = symbol.replaceAll("(<title>).*(</title>)", "$1$2");
+        symbol = symbol.replaceAll("(class=\").*?(\")", "$1$2");
+        symbol = symbol.replaceAll("(tooltip=\").*?(\")", "$1$2");
+        symbol = symbol.replaceAll("(id=\").*?(\")", "");
         if (!tooltip.isEmpty()) {
             symbol = symbol.replaceAll("<svg", "<svg tooltip=\"" + Functions.htmlAttributeEscape(tooltip) + "\"");
         }
diff --git a/core/src/test/java/org/jenkins/ui/icon/IconSetJenkins68805Test.java b/core/src/test/java/org/jenkins/ui/icon/IconSetJenkins68805Test.java
index ec88b6e86c..19dd378b0d 100644
--- a/core/src/test/java/org/jenkins/ui/icon/IconSetJenkins68805Test.java
+++ b/core/src/test/java/org/jenkins/ui/icon/IconSetJenkins68805Test.java
@@ -4,7 +4,6 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.Issue;
 
@@ -18,7 +17,6 @@ public class IconSetJenkins68805Test {
      */
     @Test
     @Issue("JENKINS-68805")
-    @Disabled("Issue is not fixed")
     void getSymbol_notSettingTooltipDoesntAddTooltipAttribute_evenWithAmpersand() {
         // cache a symbol with tooltip containing ampersand:
         String symbolWithTooltip = IconSet.getSymbol("download", "Title", "With&Ampersand", "class1 class2", "", "id");