From d1a656b3cd3fcb66fb0fc8f9a233530fe2b64a58 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 20 Nov 2013 17:25:25 +1100 Subject: [PATCH] FIxes installer when duplicate conflicts: U4-3612 Cannot install Txt starter kit in the back office --- .../businesslogic/Packager/Installer.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 49247e49ce..ef9b77e16b 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -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); + } } } }