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--property-editor-guid-to-alias

Browse Source 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
This commit is contained in:
Shannon
2013-09-17 00:27:17 +10:00
parent 86a5d16e25 bb641c937c
commit 371b1817ea
130 changed files with 2785 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Persistence/Mappers/MappingResolver.cs
View File

@@ -67,19 +67,19 @@ namespace Umbraco.Core.Persistence.Mappers
if (mapper == null)
{
return Attempt<BaseMapper>.False;
return Attempt<BaseMapper>.Fail();
}
try
{
var instance = Activator.CreateInstance(mapper) as BaseMapper;
return instance != null
? new Attempt<BaseMapper>(true, instance)
: Attempt<BaseMapper>.False;
? Attempt<BaseMapper>.Succeed(instance)
: Attempt<BaseMapper>.Fail();
}
catch (Exception ex)
{
LogHelper.Error(typeof(MappingResolver), "Could not instantiate mapper of type " + mapper, ex);
return new Attempt<BaseMapper>(ex);
return Attempt<BaseMapper>.Fail(ex);
}
}