From 336182d8b77132218ac51fc20bce5232e6e90a26 Mon Sep 17 00:00:00 2001 From: perploug Date: Thu, 31 Oct 2013 08:47:46 +0100 Subject: [PATCH] Absolute image path support, with and without tilde --- src/Umbraco.Web/Models/Trees/TreeNode.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/Models/Trees/TreeNode.cs b/src/Umbraco.Web/Models/Trees/TreeNode.cs index cf3c9cc9fb..4fa5ae5839 100644 --- a/src/Umbraco.Web/Models/Trees/TreeNode.cs +++ b/src/Umbraco.Web/Models/Trees/TreeNode.cs @@ -122,9 +122,15 @@ namespace Umbraco.Web.Models.Trees { get { - return IconIsClass - ? string.Empty - : IOHelper.ResolveUrl("~/umbraco/images/umbraco/" + Icon); + if (IconIsClass) + return string.Empty; + + //absolute path with or without tilde + if (Icon.StartsWith("~") || Icon.StartsWith("/")) + return IOHelper.ResolveUrl("~" + Icon.TrimStart('~')); + + //legacy icon path + return IOHelper.ResolveUrl("~/umbraco/images/umbraco/" + Icon); } }