From 387104fd8602da3da07260e2d23e2f19e6956ee1 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Fri, 15 Apr 2022 14:22:40 +0100
Subject: [PATCH] [JENKINS-67849] Correct icon resolution for remote icons
 (#6476)

---
 core/src/main/java/hudson/Functions.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 5bc8a57f71..0d523fdb22 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -2347,10 +2347,13 @@ public class Functions {
         }
 
         if (iconMetadata == null) {
-            if (!iconGuess.startsWith("/") && !iconGuess.startsWith("http")) {
+            //noinspection HttpUrlsUsage
+            if (iconGuess.startsWith("http://") || iconGuess.startsWith("https://")) {
+                return iconGuess;
+            }
+            if (!iconGuess.startsWith("/")) {
                 iconGuess = "/" + iconGuess;
             }
-
             iconSource = rootURL + (iconGuess.startsWith("/images/") || iconGuess.startsWith("/plugin/") ? getResourcePath() : "") + iconGuess;
         }