Don't prefix icon path if it's rooted

Fixes #5641
dnnsoftware · May 12, 2023 · 8160856 · 8160856
1 parent 23cc594
commit 8160856
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/DNN Platform/Website/admin/Containers/Icon.ascx.cs b/DNN Platform/Website/admin/Containers/Icon.ascx.cs
@@ -11,17 +11,16 @@ namespace DotNetNuke.UI.Containers
     using DotNetNuke.Services.FileSystem;
     using DotNetNuke.UI.Skins;
 
-    /// Project  : DotNetNuke
-    /// Class    : DotNetNuke.UI.Containers.Icon
-    ///
     /// <summary>
     /// Contains the attributes of an Icon.
     /// These are read into the PortalModuleBase collection as attributes for the icons within the module controls.
     /// </summary>
     public partial class Icon : SkinObjectBase
     {
+        /// <summary>Gets or sets the border width of the icon.</summary>
         public string BorderWidth { get; set; }
 
+        /// <summary>Gets or sets the CSS class on the <c>img</c> element.</summary>
         public string CssClass { get; set; }
 
         /// <inheritdoc/>
@@ -42,21 +41,25 @@ protected override void OnLoad(EventArgs e)
                 }
 
                 this.Visible = false;
-                if ((this.ModuleControl != null) && (this.ModuleControl.ModuleContext.Configuration != null))
+                if (this.ModuleControl?.ModuleContext.Configuration == null)
                 {
-                    var iconFile = this.GetIconFileUrl();
-                    if (!string.IsNullOrEmpty(iconFile))
-                    {
-                        if (Globals.IsAdminControl())
-                        {
-                            iconFile = $"~/DesktopModules/{this.ModuleControl.ModuleContext.Configuration.DesktopModule.FolderName}/{iconFile}";
-                        }
+                    return;
+                }
+
+                var iconFile = this.GetIconFileUrl();
+                if (string.IsNullOrEmpty(iconFile))
+                {
+                    return;
+                }
 
-                        this.imgIcon.ImageUrl = iconFile;
-                        this.imgIcon.AlternateText = this.ModuleControl.ModuleContext.Configuration.ModuleTitle;
-                        this.Visible = true;
-                    }
+                if (!iconFile.StartsWith("~", StringComparison.Ordinal) && Globals.IsAdminControl())
+                {
+                    iconFile = $"~/DesktopModules/{this.ModuleControl.ModuleContext.Configuration.DesktopModule.FolderName}/{iconFile}";
                 }
+
+                this.imgIcon.ImageUrl = iconFile;
+                this.imgIcon.AlternateText = this.ModuleControl.ModuleContext.Configuration.ModuleTitle;
+                this.Visible = true;
             }
             catch (Exception exc)
             {
@@ -67,7 +70,7 @@ protected override void OnLoad(EventArgs e)
         private string GetIconFileUrl()
         {
             var iconFile = this.ModuleControl.ModuleContext.Configuration.IconFile;
-            if (string.IsNullOrEmpty(iconFile) || iconFile.StartsWith("~"))
+            if (string.IsNullOrEmpty(iconFile) || iconFile.StartsWith("~", StringComparison.Ordinal))
             {
                 return iconFile;
             }