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

FIxes installer when duplicate conflicts: U4-3612 Cannot install Txt starter kit in the back office

Browse Source
This commit is contained in:
Shannon
2013-11-20 17:25:25 +11:00
parent d87db5b338
commit d1a656b3cd
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/umbraco.cms/businesslogic/Packager/Installer.cs
View File

@@ -626,7 +626,10 @@ namespace umbraco.cms.businesslogic.packager
if (m != null)
{
ContainsMacroConflict = true;
_conflictingMacroAliases.Add(m.Name, alias);
if (_conflictingMacroAliases.ContainsKey(m.Name) == false)
{
_conflictingMacroAliases.Add(m.Name, alias);
}
}
}
}
@@ -639,8 +642,11 @@ namespace umbraco.cms.businesslogic.packager
var t = Template.GetByAlias(alias);
if (t != null)
{
this.ContainsTemplateConflicts = true;
this._conflictingTemplateAliases.Add(t.Text, alias);
ContainsTemplateConflicts = true;
if (_conflictingTemplateAliases.ContainsKey(t.Text) == false)
{
_conflictingTemplateAliases.Add(t.Text, alias);
}
}
}
}
@@ -653,8 +659,11 @@ namespace umbraco.cms.businesslogic.packager
var s = StyleSheet.GetByName(alias);
if (s != null)
{
this.ContainsStyleSheeConflicts = true;
this._conflictingStyleSheetNames.Add(s.Text, alias);
ContainsStyleSheeConflicts = true;
if (_conflictingStyleSheetNames.ContainsKey(s.Text) == false)
{
_conflictingStyleSheetNames.Add(s.Text, alias);
}
}
}
}