From 57ed4698f01be40328698c991c88de4e8a495064 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 19 Apr 2021 17:31:09 +0200
Subject: [PATCH] Revert "Revert "The Value() method for IPublishedContent was
 not working with the defaultValue parameter" (#9989)"

This reverts commit 156c1c94161171f9592923f20de4e142c845469a.
---
 src/Umbraco.Web/PublishedContentExtensions.cs |  6 ++--
 src/Umbraco.Web/PublishedPropertyExtension.cs | 33 ++++++-------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index c851894149..6384b0f8d4 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -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, default
-            return property == null ? default : property.Value<T>(culture, segment, fallback, defaultValue);
+            // vision of 'no value' (could be an empty enumerable) - otherwise, defaultValue
+            return property == null ? defaultValue : property.Value<T>(culture, segment, defaultValue: defaultValue);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedPropertyExtension.cs b/src/Umbraco.Web/PublishedPropertyExtension.cs
index 6e8647db47..0c3aa57cc2 100644
--- a/src/Umbraco.Web/PublishedPropertyExtension.cs
+++ b/src/Umbraco.Web/PublishedPropertyExtension.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
@@ -36,20 +37,13 @@ namespace Umbraco.Web
                 // we have a value
                 // try to cast or convert it
                 var value =  property.GetValue(culture, segment);
-                if (value is T valueAsT)
-                {
-                    return valueAsT;
-                }
-
+                if (value is T valueAsT) return valueAsT;
                 var valueConverted = value.TryConvertTo<T>();
-                if (valueConverted)
-                {
-                    return valueConverted.Result;
-                }
+                if (valueConverted) return valueConverted.Result;
 
-                // cannot cast nor convert the value, nothing we can return but 'default'
+                // cannot cast nor convert the value, nothing we can return but 'defaultValue'
                 // note: we don't want to fallback in that case - would make little sense
-                return default;
+                return defaultValue;
             }
 
             // we don't have a value, try fallback
@@ -63,22 +57,15 @@ namespace Umbraco.Web
             var noValue = property.GetValue(culture, segment);
             if (noValue == null)
             {
-                return default;
-            }
-
-            if (noValue is T noValueAsT)
-            {
-                return noValueAsT;
+                return defaultValue;
             }
+            if (noValue is T noValueAsT) return noValueAsT;
 
             var noValueConverted = noValue.TryConvertTo<T>();
-            if (noValueConverted)
-            {
-                return noValueConverted.Result;
-            }
+            if (noValueConverted) return noValueConverted.Result;
 
-            // cannot cast noValue nor convert it, nothing we can return but 'default'
-            return default;
+            // cannot cast noValue nor convert it, nothing we can return but 'defaultValue'
+            return defaultValue;
         }
 
         #endregion