From 0107a101452aaae211a704cf57962bae26033417 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Thu, 18 Apr 2013 00:06:42 +0600 Subject: [PATCH] Manually merge in changes for previous commits due to the codebase differences in 6.1 --- .../umbraco/controls/ContentControl.cs | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs index e1e300136e..121cffdb9b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs @@ -344,18 +344,28 @@ namespace umbraco.controls /// private void SetNameAndDataTypeValues() { - if (!string.IsNullOrEmpty(NameTxt.Text)) - _content.Text = NameTxt.Text; - - foreach (var property in DataTypes) + //we only continue saving anything if: + // SavePropertyDataWhenInvalid == true + // OR if the page is actually valid. + if (SavePropertyDataWhenInvalid || Page.IsValid) { - var defaultData = property.Value.Data as DefaultData; - if (defaultData != null) + + foreach (var property in DataTypes) { - defaultData.PropertyTypeAlias = property.Key; - defaultData.NodeId = _content.Id; + var defaultData = property.Value.Data as DefaultData; + if (defaultData != null) + { + defaultData.PropertyTypeAlias = property.Key; + defaultData.NodeId = _content.Id; + } + property.Value.DataEditor.Save(); + } + + //don't update if the name is empty + if (!NameTxt.Text.IsNullOrWhiteSpace()) + { + _content.Text = NameTxt.Text; } - property.Value.DataEditor.Save(); } }