From d300146cf6dd640aff489c31f373134d77782d15 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 20:44:53 +0100
Subject: [PATCH] trips content/media names, makes sure that the content type
 editor when rendering template names html encodes the names.

---
 src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs     | 6 ++++--
 .../umbraco/settings/EditNodeTypeNew.aspx.cs                | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs b/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs
index b5510ec85d..dda19f9ff9 100644
--- a/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs
+++ b/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs
@@ -162,7 +162,7 @@ namespace Umbraco.Web.WebApi.Binders
                 //finally, let's lookup the real content item and create the DTO item
                 model.PersistedContent = GetExisting(model);                
             }
-
+            
             //create the dto from the persisted model
             if (model.PersistedContent != null)
             {
@@ -173,7 +173,9 @@ namespace Umbraco.Web.WebApi.Binders
                 //now map all of the saved values to the dto
                 MapPropertyValuesFromSaved(model, model.ContentDto);    
             }
-            
+
+            model.Name = model.Name.Trim();
+
             return model;
         }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
index 6e3756d2a0..493bce0d48 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
@@ -118,7 +118,7 @@ namespace umbraco.settings
             templateList.Items.Clear();
             templateList.Items.AddRange(templates.ConvertAll(item =>
             {
-                var li = new ListItem { Text = item.Name.CleanForXss(), Value = item.Id.ToString(CultureInfo.InvariantCulture), Selected = item.Selected };
+                var li = new ListItem { Text = Server.HtmlEncode(item.Name), Value = item.Id.ToString(CultureInfo.InvariantCulture), Selected = item.Selected };
                 return li;
             }).ToArray());
 
@@ -128,7 +128,7 @@ namespace umbraco.settings
             ddlTemplates.Items.Insert(0, new ListItem(ui.Text("choose") + "...", "0"));
             ddlTemplates.Items.AddRange(templates.ConvertAll(item =>
             {
-                var li = new ListItem { Text = item.Name.CleanForXss(), Value = item.Id.ToString(CultureInfo.InvariantCulture) };
+                var li = new ListItem { Text = Server.HtmlEncode(item.Name), Value = item.Id.ToString(CultureInfo.InvariantCulture) };
                 return li;
             }).ToArray());