From 0dff9c5dfabf5b987f92a564c9779dfeb38f0431 Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Wed, 6 Jul 2011 09:45:02 -0200
Subject: [PATCH] Fixes Ensure valid template aliases, work item: 30347

---
 .../cms/businesslogic/template/Template.cs    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/umbraco/cms/businesslogic/template/Template.cs b/umbraco/cms/businesslogic/template/Template.cs
index e0b755c6e4..da13c421fe 100644
--- a/umbraco/cms/businesslogic/template/Template.cs
+++ b/umbraco/cms/businesslogic/template/Template.cs
@@ -295,9 +295,6 @@ namespace umbraco.cms.businesslogic.template
 
         public static Template MakeNew(string Name, BusinessLogic.User u, Template master)
         {
-            //ensure unique alias 
-            if (GetByAlias(Name) != null)
-                Name = EnsureUniqueAlias(Name, 1);
 
             Template t = MakeNew(Name, u);
             t.MasterTemplate = master.Id;
@@ -319,23 +316,25 @@ namespace umbraco.cms.businesslogic.template
             return t;
         }
 
-        public static Template MakeNew(string Name, BusinessLogic.User u)
+        public static Template MakeNew(string name, BusinessLogic.User u)
         {
-            //ensure unique alias 
-            if (GetByAlias(Name) != null)
-                Name = EnsureUniqueAlias(Name, 1);
 
             // CMSNode MakeNew(int parentId, Guid objectType, int userId, int level, string text, Guid uniqueID)
-            CMSNode n = CMSNode.MakeNew(-1, _objectType, u.Id, 1, Name, Guid.NewGuid());
-            Name = Name.Replace("/", ".").Replace("\\", "");
+            CMSNode n = CMSNode.MakeNew(-1, _objectType, u.Id, 1, name, Guid.NewGuid());
 
-            if (Name.Length > 100)
-                Name = Name.Substring(0, 95) + "...";
+            //ensure unique alias 
+            name = helpers.Casing.SafeAlias(name);
+            if (GetByAlias(name) != null)
+                name = EnsureUniqueAlias(name, 1);
+            name = name.Replace("/", ".").Replace("\\", "");
+
+            if (name.Length > 100)
+                name = name.Substring(0, 95) + "...";
 
 
             SqlHelper.ExecuteNonQuery("INSERT INTO cmsTemplate (NodeId, Alias, design, master) VALUES (@nodeId, @alias, @design, @master)",
                                       SqlHelper.CreateParameter("@nodeId", n.Id),
-                                      SqlHelper.CreateParameter("@alias", Name),
+                                      SqlHelper.CreateParameter("@alias", name),
                                       SqlHelper.CreateParameter("@design", ' '),
                                       SqlHelper.CreateParameter("@master", DBNull.Value));