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

fixes some macro unit tests (some still need fixing though)

Browse Source
This commit is contained in:
Shannon
2015-12-20 20:17:57 +01:00
parent 04e7979fe6
commit 7ec63ad491
5 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Strings/ContentBaseExtensions.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Core.Strings
if (content == null) throw new ArgumentNullException("content");
if (urlSegmentProviders == null) throw new ArgumentNullException("urlSegmentProviders");
var url = urlSegmentProviders.Select(p => p.GetUrlSegment(content)).First(u => u != null);
var url = urlSegmentProviders.Select(p => p.GetUrlSegment(content)).FirstOrDefault(u => u != null);
url = url ?? new DefaultUrlSegmentProvider().GetUrlSegment(content); // be safe
return url;
}
@@ -41,7 +41,7 @@ namespace Umbraco.Core.Strings
if (culture == null) throw new ArgumentNullException("culture");
if (urlSegmentProviders == null) throw new ArgumentNullException("urlSegmentProviders");
var url = urlSegmentProviders.Select(p => p.GetUrlSegment(content, culture)).First(u => u != null);
var url = urlSegmentProviders.Select(p => p.GetUrlSegment(content, culture)).FirstOrDefault(u => u != null);
url = url ?? new DefaultUrlSegmentProvider().GetUrlSegment(content, culture); // be safe
return url;
}