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

Fixes: U4-4039 @Umbraco.Field("writerName") etc. don't work any more

Browse Source
This commit is contained in:
Shannon
2014-01-14 11:43:56 +11:00
parent 457560920d
commit e36b3d46e8
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/umbraco.presentation/item.cs
View File

@@ -79,7 +79,7 @@ namespace umbraco
else else
{ {
//check for published content and get its value using that //check for published content and get its value using that
if (publishedContent != null) if (publishedContent != null && publishedContent.HasProperty(_fieldName))
{ {
var pval = publishedContent.GetPropertyValue(_fieldName); var pval = publishedContent.GetPropertyValue(_fieldName);
var rval = pval == null ? string.Empty : pval.ToString(); var rval = pval == null ? string.Empty : pval.ToString();
@@ -94,11 +94,22 @@ namespace umbraco
//now we check if the value is still empty and if so we'll check useIfEmpty //now we check if the value is still empty and if so we'll check useIfEmpty
if (string.IsNullOrEmpty(_fieldContent)) if (string.IsNullOrEmpty(_fieldContent))
{ {
//if useIfEmpty is true
if (string.IsNullOrEmpty(helper.FindAttribute(attributes, "useIfEmpty")) == false) if (string.IsNullOrEmpty(helper.FindAttribute(attributes, "useIfEmpty")) == false)
{ {
if (elements[helper.FindAttribute(attributes, "useIfEmpty")] != null && string.IsNullOrEmpty(elements[helper.FindAttribute(attributes, "useIfEmpty")].ToString()) == false) var altFieldName = helper.FindAttribute(attributes, "useIfEmpty");
//check for published content and get its value using that
if (publishedContent != null && publishedContent.HasProperty(altFieldName))
{ {
_fieldContent = elements[helper.FindAttribute(attributes, "useIfEmpty")].ToString().Trim(); var pval = publishedContent.GetPropertyValue(altFieldName);
var rval = pval == null ? string.Empty : pval.ToString();
_fieldContent = rval.IsNullOrWhiteSpace() ? _fieldContent : rval;
}
else if (elements[altFieldName] != null && string.IsNullOrEmpty(elements[altFieldName].ToString()) == false)
{
//get the vaue the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent)
_fieldContent = elements[altFieldName].ToString().Trim();
} }
} }
} }