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

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent

Browse Source 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
This commit is contained in:
Stephan
2013-10-03 18:49:58 +02:00
parent 1902bc4807 9e1364db42
commit e14e5bee95
8 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Models/DynamicPublishedContent.cs
View File

@@ -14,6 +14,7 @@ using Umbraco.Core.Models;
using Umbraco.Core;
using System.Reflection;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Strings;
using ContentType = umbraco.cms.businesslogic.ContentType;
namespace Umbraco.Web.Models
@@ -354,9 +355,9 @@ namespace Umbraco.Web.Models
{
//if we cannot get with the current alias, try changing it's case
attempt = alias[0].IsUpperCase()
? getMember(alias.ConvertCase(StringAliasCaseType.CamelCase))
: getMember(alias.ConvertCase(StringAliasCaseType.PascalCase));
}
? getMember(alias.ToCleanString(CleanStringType.Ascii | CleanStringType.Alias | CleanStringType.CamelCase))
: getMember(alias.ToCleanString(CleanStringType.Ascii | CleanStringType.Alias | CleanStringType.PascalCase));
}
return !attempt.Success
? null