From ee76f917e8a92f8e49db6043ef16a45cfea362ad Mon Sep 17 00:00:00 2001 From: Riliane Date: Tue, 31 May 2022 12:12:05 +0300 Subject: [PATCH] JENKINS-68639 Check whether an icon path already contains the context path before appending the context path to it --- core/src/main/java/hudson/Functions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index a67bf746c3..5033bb5b4b 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -2377,7 +2377,9 @@ public class Functions { if (!iconGuess.startsWith("/")) { iconGuess = "/" + iconGuess; } - iconSource = rootURL + (iconGuess.startsWith("/images/") || iconGuess.startsWith("/plugin/") ? getResourcePath() : "") + iconGuess; + iconSource = iconGuess.startsWith(rootURL) ? "" : rootURL; + iconSource += (iconGuess.startsWith("/images/") || iconGuess.startsWith("/plugin/") ? getResourcePath() : + "") + iconGuess; } if (iconMetadata != null && iconMetadata.getClassSpec() != null) {