diff --git a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs index dd235bda75..f09638330b 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs @@ -35,6 +35,11 @@ namespace Umbraco.Web.Models.Mapping public UrlInfo[] Resolve(IContent source, ContentItemDisplay destination, UrlInfo[] destMember, ResolutionContext context) { + if (source.ContentType.IsElement) + { + return new UrlInfo[0]; + } + var umbracoContext = _umbracoContextAccessor.UmbracoContext; var urls = umbracoContext == null diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs index 7ed530093c..4dd4820d26 100644 --- a/src/Umbraco.Web/Routing/UrlProvider.cs +++ b/src/Umbraco.Web/Routing/UrlProvider.cs @@ -185,7 +185,7 @@ namespace Umbraco.Web.Routing /// public string GetUrl(IPublishedContent content, UrlProviderMode mode, string culture = null, Uri current = null) { - if (content == null) + if (content == null || content.ItemType == PublishedItemType.Element) return "#"; // this the ONLY place where we deal with default culture - IUrlProvider always receive a culture