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

Added a null check in constuctor to MacroModel

Browse Source
This commit is contained in:
agrath
2012-05-14 08:47:56 -12:00
parent f8bef6880d
commit 3f2db11459
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
umbraco/cms/businesslogic/macro/MacroModel.cs
View File

@@ -40,28 +40,27 @@ namespace umbraco.cms.businesslogic.macro
public MacroModel(Macro m)
{
Id = m.Id;
Name = m.Name;
Alias = m.Alias;
TypeAssembly = m.Assembly;
TypeName = m.Type;
Xslt = m.Xslt;
ScriptName = m.ScriptingFile;
CacheDuration = m.RefreshRate;
CacheByPage = m.CacheByPage;
CacheByMember = m.CachePersonalized;
RenderInEditor = m.RenderContent;
Properties = new List<MacroPropertyModel>();
foreach (MacroProperty mp in m.Properties)
if (m != null)
{
Properties.Add(
new MacroPropertyModel(mp.Alias, string.Empty, mp.Type.Alias, mp.Type.BaseType));
Id = m.Id;
Name = m.Name;
Alias = m.Alias;
TypeAssembly = m.Assembly;
TypeName = m.Type;
Xslt = m.Xslt;
ScriptName = m.ScriptingFile;
CacheDuration = m.RefreshRate;
CacheByPage = m.CacheByPage;
CacheByMember = m.CachePersonalized;
RenderInEditor = m.RenderContent;
foreach (MacroProperty mp in m.Properties)
{
Properties.Add(
new MacroPropertyModel(mp.Alias, string.Empty, mp.Type.Alias, mp.Type.BaseType));
}
MacroType = Macro.FindMacroType(Xslt, ScriptName, TypeName, TypeAssembly);
}
MacroType = Macro.FindMacroType(Xslt, ScriptName, TypeName, TypeAssembly);
}
public MacroModel(string name, string alias, string typeAssembly, string typeName, string xslt, string scriptName, int cacheDuration, bool cacheByPage, bool cacheByMember)