Merge with 6.0.1

2013-02-01 19:43:10 +06:00
parent fa2ea78bda 6e1316cb95
commit e8d924cd2c
6 changed files with 32 additions and 35 deletions
--- a/src/Umbraco.Core/Models/ContentExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentExtensions.cs
@@ -418,7 +418,7 @@ namespace Umbraco.Core.Models
 				//Check for umbracoUrlName convention
                if (property.Alias == "umbracoUrlName" && property.Value != null && 
                        property.Value.ToString().Trim() != string.Empty)
-					xml.SetAttributeValue("urlName", property.Value);
+                    xml.SetAttributeValue("urlName", property.Value.ToString().FormatUrl().ToLower());
 			}

 			return xml;