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

trips content/media names, makes sure that the content type editor when rendering template names html encodes the names.

Browse Source
This commit is contained in:
Shannon
2015-11-25 20:44:53 +01:00
parent c8482b9f59
commit d300146cf6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs
View File

@@ -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;
}

4
src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
View File

@@ -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());