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

Fixed null checks and error checking for duplicates in the xml file store, added test

Browse Source
This commit is contained in:
Shannon
2014-12-18 12:33:34 +11:00
parent f63ec81c47
commit cd0aa5e342
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Core/Services/LocalizedTextService.cs
View File

@@ -134,7 +134,12 @@ namespace Umbraco.Core.Services
var keys = area.XPathSelectElements("./key");
foreach (var key in keys)
{
result.Add(string.Format("{0}/{1}", (string) area.Attribute("alias"), (string) key.Attribute("alias")), key.Value);
var dictionaryKey = string.Format("{0}/{1}", (string) area.Attribute("alias"), (string) key.Attribute("alias"));
//there could be duplicates if the language file isn't formatted nicely - which is probably the case for quite a few lang files
if (result.ContainsKey(dictionaryKey) == false)
{
result.Add(dictionaryKey, key.Value);
}
}
}
}
@@ -150,7 +155,12 @@ namespace Umbraco.Core.Services
{
foreach (var key in area.Value)
{
result.Add(string.Format("{0}/{1}", area.Key, key.Key), key.Value);
var dictionaryKey = string.Format("{0}/{1}", area.Key, key.Key);
//i don't think it's possible to have duplicates because we're dealing with a dictionary in the first place, but we'll double check here just in case.
if (result.ContainsKey(dictionaryKey) == false)
{
result.Add(dictionaryKey, key.Value);
}
}
}
}