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

merge branch '6.2.0' into '7.0.0'

Browse Source
This commit is contained in:
Stephan
2013-09-12 12:35:43 +02:00
parent 7642619407 67a632aa43
commit d1af20424e
48 changed files with 864 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
View File

@@ -514,12 +514,10 @@ namespace Umbraco.Core.Configuration
{
try
{
List<string> items = new List<string>();
XmlNode root = GetKeyAsNode("/settings/scripting/razor/notDynamicXmlDocumentElements");
foreach (XmlNode element in root.SelectNodes(".//element"))
{
items.Add(element.InnerText);
}
var items = new List<string>();
var root = GetKeyAsNode("/settings/scripting/razor/notDynamicXmlDocumentElements");
if (root != null)
items.AddRange(root.SelectNodes(".//element").Cast<XmlNode>().Select(n => n.InnerText));
return items;
}
catch