yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

Browse Source 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
This commit is contained in:
Sebastiaan Janssen
2015-11-17 13:43:19 +01:00
parent 3d95b4d73a 0fecad9867
commit 05c592860d
38 changed files with 104 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs
View File

@@ -3,6 +3,7 @@ using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Models.Validation;
@@ -67,8 +68,8 @@ namespace Umbraco.Web.Models.ContentEditing
get
{
return IconIsClass
? string.Empty
: IOHelper.ResolveUrl("~/umbraco/images/umbraco/" + Icon);
? string.Empty
: string.Format("{0}images/umbraco/{1}", GlobalSettings.Path.EnsureEndsWith("/"), Icon);
}
}
@@ -105,4 +106,4 @@ namespace Umbraco.Web.Models.ContentEditing
}
}
}
}
}

3
src/Umbraco.Web/Models/Trees/TreeNode.cs
View File

@@ -2,6 +2,7 @@
using Umbraco.Core.IO;
using System.Collections.Generic;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.Web.Models.Trees
@@ -109,7 +110,7 @@ namespace Umbraco.Web.Models.Trees
return IOHelper.ResolveUrl("~" + Icon.TrimStart('~'));
//legacy icon path
return IOHelper.ResolveUrl("~/umbraco/images/umbraco/" + Icon);
return string.Format("{0}images/umbraco/{1}", GlobalSettings.Path.EnsureEndsWith("/"), Icon);
}
}