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 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Web/Standalone/StandaloneBootManager.cs
	src/Umbraco.Web/UmbracoContext.cs
This commit is contained in:
Shannon
2013-10-28 11:26:01 +11:00
parent d0ef627532 6cfb864055
commit fea90482b6
4 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/PublishedContent/PublishedContentModelFactoryImpl.cs
View File

@@ -22,8 +22,6 @@ namespace Umbraco.Core.Models.PublishedContent
foreach (var type in types)
{
if (type.Inherits<PublishedContentModel>() == false)
throw new InvalidOperationException(string.Format("Type {0} is marked with PublishedContentModel attribute but does not inherit from PublishedContentExtended.", type.FullName));
var constructor = type.GetConstructor(ctorArgTypes);
if (constructor == null)
throw new InvalidOperationException(string.Format("Type {0} is missing a public constructor with one argument of type IPublishedContent.", type.FullName));