From c98d906f36abade5b1a20d941f04de525f58f82a Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 28 Dec 2012 19:08:01 -0100 Subject: [PATCH] Correcting a few formatting issues after importing patch. --- src/Umbraco.Core/Models/ContentExtensions.cs | 3 +-- src/Umbraco.Core/StringExtensions.cs | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs index ef8bd636df..240724b507 100644 --- a/src/Umbraco.Core/Models/ContentExtensions.cs +++ b/src/Umbraco.Core/Models/ContentExtensions.cs @@ -12,7 +12,6 @@ using Umbraco.Core.IO; using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.UnitOfWork; -using Umbraco.Core.Services; namespace Umbraco.Core.Models { @@ -393,7 +392,7 @@ namespace Umbraco.Core.Models //nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias); //var nodeName = content.ContentType.Alias.ToUmbracoAlias(StringAliasCaseType.CamelCase, true); var nodeName = content.ContentType.Alias; - var niceUrl = content.Name.FormatUrl().ToLower() ; + var niceUrl = content.Name.FormatUrl().ToLower(); var xml = new XElement(nodeName, new XAttribute("id", content.Id), diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index cc2818b03c..5be5256bb9 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/StringExtensions.cs @@ -744,21 +744,21 @@ namespace Umbraco.Core public static string FormatUrl(this string url) { - string _newUrl = url; + string newUrl = url; XmlNode replaceChars = UmbracoSettings.UrlReplaceCharacters; foreach (XmlNode n in replaceChars.SelectNodes("char")) { if (n.Attributes.GetNamedItem("org") != null && n.Attributes.GetNamedItem("org").Value != "") - _newUrl = _newUrl.Replace(n.Attributes.GetNamedItem("org").Value, Umbraco.Core.XmlHelper.GetNodeValue(n)); + newUrl = newUrl.Replace(n.Attributes.GetNamedItem("org").Value, XmlHelper.GetNodeValue(n)); } // check for double dashes if (UmbracoSettings.RemoveDoubleDashesFromUrlReplacing) { - _newUrl = Regex.Replace(_newUrl, @"[-]{2,}", "-"); + newUrl = Regex.Replace(newUrl, @"[-]{2,}", "-"); } - return _newUrl; + return newUrl; } } }