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

Merge remote-tracking branch 'origin/6.2.0' into 6.2.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:16:29 +02:00
parent 06206c60d9 08660704cc
commit a264342bcc
161 changed files with 387 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs
View File

@@ -8,6 +8,7 @@ using System.Web;
using Umbraco.Core;
using Umbraco.Core.Dynamics;
using Umbraco.Core.Logging;
using Umbraco.Core.Strings;
using umbraco.interfaces;
using System.Collections;
using System.Reflection;
@@ -670,8 +671,8 @@ namespace umbraco.MacroEngines
{
//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 ? attempt.Result : null;