From 738749b705d8ea99fd5c8de88a25cd0888ddf1c2 Mon Sep 17 00:00:00 2001
From: Lucas Bach Bisgaard <rammi@rammi.dk>
Date: Tue, 17 Oct 2023 13:24:24 +0200
Subject: [PATCH] Fixes #14351 - Using Fallback to default langauge on a
 specific item changes the whole VariationContext  (#14620)

---
 .../Extensions/PublishedElementExtensions.cs  | 23 -------------------
 .../IPublishedValueFallback.cs                |  1 +
 .../PublishedValueFallback.cs                 |  1 +
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Core/Extensions/PublishedElementExtensions.cs b/src/Umbraco.Core/Extensions/PublishedElementExtensions.cs
index 440962cd76..c85178c85c 100644
--- a/src/Umbraco.Core/Extensions/PublishedElementExtensions.cs
+++ b/src/Umbraco.Core/Extensions/PublishedElementExtensions.cs
@@ -134,27 +134,6 @@ public static class PublishedElementExtensions
 
     #endregion
 
-    #region CheckVariation
-    /// <summary>
-    /// Method to check if VariationContext culture differs from culture parameter, if so it will update the VariationContext for the PublishedValueFallback.
-    /// </summary>
-    /// <param name="publishedValueFallback">The requested PublishedValueFallback.</param>
-    /// <param name="culture">The requested culture.</param>
-    /// <param name="segment">The requested segment.</param>
-    /// <returns></returns>
-    private static void EventuallyUpdateVariationContext(IPublishedValueFallback publishedValueFallback, string? culture, string? segment)
-    {
-        IVariationContextAccessor? variationContextAccessor = publishedValueFallback.VariationContextAccessor;
-
-        //If there is a difference in requested culture and the culture that is set in the VariationContext, it will pick wrong localized content.
-        //This happens for example using links to localized content in a RichText Editor.
-        if (!string.IsNullOrEmpty(culture) && variationContextAccessor?.VariationContext?.Culture != culture)
-        {
-            variationContextAccessor!.VariationContext = new VariationContext(culture, segment);
-        }
-    }
-    #endregion
-
     #region Value<T>
 
     /// <summary>
@@ -195,8 +174,6 @@ public static class PublishedElementExtensions
     {
         IPublishedProperty? property = content.GetProperty(alias);
 
-        EventuallyUpdateVariationContext(publishedValueFallback, culture, segment);
-
         // if we have a property, and it has a value, return that value
         if (property != null && property.HasValue(culture, segment))
         {
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
index 111d747ec1..839b73ea51 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
@@ -5,6 +5,7 @@ namespace Umbraco.Cms.Core.Models.PublishedContent;
 /// </summary>
 public interface IPublishedValueFallback
 {
+    [Obsolete("Scheduled for removal in v14")]
     /// <summary>
     /// VariationContextAccessor that is not required to be implemented, therefore throws NotImplementedException as default.
     /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedValueFallback.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedValueFallback.cs
index 1d4c512f78..0524ee98a9 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedValueFallback.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedValueFallback.cs
@@ -20,6 +20,7 @@ public class PublishedValueFallback : IPublishedValueFallback
         _variationContextAccessor = variationContextAccessor;
     }
 
+    [Obsolete("Scheduled for removal in v14")]
     public IVariationContextAccessor VariationContextAccessor { get { return _variationContextAccessor; } }
 
     /// <inheritdoc />