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

Merge branch origin/dev-v7 into dev-v7-deploy

Browse Source
This commit is contained in:
Stephan
2016-08-18 12:38:38 +02:00
parent 01990394dd f658613fad
commit acae05d287
665 changed files with 22645 additions and 17351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/Editors/ContentControllerBase.cs
View File

@@ -97,13 +97,14 @@ namespace Umbraco.Web.Editors
var d = new Dictionary<string, object>();
//add the files if any
var files = contentItem.UploadedFiles.Where(x => x.PropertyAlias == p.Alias).ToArray();
if (files.Any())
if (files.Length > 0)
{
d.Add("files", files);
// add extra things needed to figure out where to put the files
d.Add("cuid", contentItem.PersistedContent.Key);
d.Add("puid", dboProperty.PropertyType.Key);
}
var data = new ContentPropertyData(p.Value, p.PreValues, d);
//get the deserialized value from the property editor
@@ -116,7 +117,7 @@ namespace Umbraco.Web.Editors
var valueEditor = p.PropertyEditor.ValueEditor;
//don't persist any bound value if the editor is readonly
if (valueEditor.IsReadOnly == false)
{
{
var propVal = p.PropertyEditor.ValueEditor.ConvertEditorToDb(data, dboProperty.Value);
var supportTagsAttribute = TagExtractor.GetAttribute(p.PropertyEditor);
if (supportTagsAttribute != null)