Revert "The Value() method for IPublishedContent was not working with the defaultValue parameter (#9888)"

This reverts commit 52b670973d.
This commit is contained in:
Sebastiaan Janssen
2021-04-19 17:31:53 +02:00
parent 57ed4698f0
commit f1e4fec4c4
2 changed files with 6 additions and 13 deletions

View File

@@ -173,8 +173,8 @@ namespace Umbraco.Web
return value;
// else... if we have a property, at least let the converter return its own
// vision of 'no value' (could be an empty enumerable) - otherwise, defaultValue
return property == null ? defaultValue : property.Value<T>(culture, segment, defaultValue: defaultValue);
// vision of 'no value' (could be an empty enumerable) - otherwise, default
return property == null ? default : property.Value<T>(culture, segment);
}
#endregion

View File

@@ -41,31 +41,24 @@ namespace Umbraco.Web
var valueConverted = value.TryConvertTo<T>();
if (valueConverted) return valueConverted.Result;
// cannot cast nor convert the value, nothing we can return but 'defaultValue'
// cannot cast nor convert the value, nothing we can return but 'default'
// note: we don't want to fallback in that case - would make little sense
return defaultValue;
return default;
}
// we don't have a value, try fallback
if (PublishedValueFallback.TryGetValue(property, culture, segment, fallback, defaultValue, out var fallbackValue))
{
return fallbackValue;
}
// we don't have a value - neither direct nor fallback
// give a chance to the converter to return something (eg empty enumerable)
var noValue = property.GetValue(culture, segment);
if (noValue == null)
{
return defaultValue;
}
if (noValue is T noValueAsT) return noValueAsT;
var noValueConverted = noValue.TryConvertTo<T>();
if (noValueConverted) return noValueConverted.Result;
// cannot cast noValue nor convert it, nothing we can return but 'defaultValue'
return defaultValue;
// cannot cast noValue nor convert it, nothing we can return but 'default'
return default;
}
#endregion