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 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
This commit is contained in:
Shannon
2013-11-20 17:28:33 +11:00
parent 416a9ed064
commit 5a928aa459
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -857,9 +857,14 @@ namespace umbraco.cms.businesslogic.packager
{
var m = new Macro(alias);
this._containsMacroConflict = true;
this._conflictingMacroAliases.Add(m.Name, alias);
if (_conflictingMacroAliases.ContainsKey(m.Name) == false)
{
_conflictingMacroAliases.Add(m.Name, alias);
}
}
catch (IndexOutOfRangeException) { } //thrown when the alias doesn't exist in the DB, ie - macro not there
}
}
}
@@ -872,7 +877,10 @@ namespace umbraco.cms.businesslogic.packager
if (t != null)
{
this._containsTemplateConflict = true;
this._conflictingTemplateAliases.Add(t.Text, alias);
if (_conflictingTemplateAliases.ContainsKey(t.Text) == false)
{
_conflictingTemplateAliases.Add(t.Text, alias);
}
}
}
}
@@ -886,7 +894,10 @@ namespace umbraco.cms.businesslogic.packager
if (s != null)
{
this._containsStyleSheetConflict = true;
this._conflictingStyleSheetNames.Add(s.Text, alias);
if (_conflictingStyleSheetNames.ContainsKey(s.Text) == false)
{
_conflictingStyleSheetNames.Add(s.Text, alias);
}
}
}
}