diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs index 1ae6a9f6fb..2703cd448d 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs @@ -160,7 +160,7 @@ namespace Umbraco.Tests.PublishedContent Assert.IsNotNull(publishedContent); Assert.AreEqual("It Works1!", publishedContent.Name); Assert.AreEqual("val1", publishedContent.Value("prop")); - Assert.AreEqual("val-fr1", publishedContent.Value("prop", "fr-FR")); // fixme wtf is happening here? + Assert.AreEqual("val-fr1", publishedContent.Value("prop", "fr-FR")); Assert.AreEqual("val-uk1", publishedContent.Value("prop", "en-UK")); Assert.AreEqual("name-fr1", publishedContent.GetCulture("fr-FR").Name); diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Property.cs b/src/Umbraco.Web/PublishedCache/NuCache/Property.cs index 0c48b4b52c..63e82ffa6c 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/Property.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/Property.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Xml.Serialization; using Umbraco.Core; using Umbraco.Core.Cache; @@ -163,7 +162,7 @@ namespace Umbraco.Web.PublishedCache.NuCache var k = new CompositeStringStringKey(culture, segment); if (!_sourceValues.TryGetValue(k, out var vvalue)) - _sourceValues[k] = vvalue = new SourceInterValue { Culture = culture, Segment = segment, SourceValue = GetSourceValue(culture, segment) }; // fixme where is the source? + _sourceValues[k] = vvalue = new SourceInterValue { Culture = culture, Segment = segment, SourceValue = GetSourceValue(culture, segment) }; if (vvalue.InterInitialized) return vvalue.InterValue; vvalue.InterValue = PropertyType.ConvertSourceToInter(_content, vvalue.SourceValue, _isPreviewing); diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs index 40a127335a..d5294c723f 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs @@ -27,7 +27,7 @@ namespace Umbraco.Web.PublishedCache.NuCache _contentNode = contentNode; _contentData = contentData; _publishedSnapshotAccessor = publishedSnapshotAccessor; - VariationContextAccessor = variationContextAccessor; // fixme why is this a property? should be be on the base class? + VariationContextAccessor = variationContextAccessor; _urlSegment = _contentData.Name.ToUrlSegment(); IsPreviewing = _contentData.Published == false; @@ -399,6 +399,7 @@ namespace Umbraco.Web.PublishedCache.NuCache #region Internal + // used by property internal IVariationContextAccessor VariationContextAccessor { get; } // used by navigable content diff --git a/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs b/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs index 893445add6..6d7932d4e2 100644 --- a/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs +++ b/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs @@ -22,7 +22,7 @@ namespace Umbraco.Web.Routing //ok so it's a custom route with published content assigned, check if the id being requested for is the same id as the assigned published content return content.Id == umbracoContext.PublishedRequest.PublishedContent.Id - ? umbracoContext.PublishedRequest.PublishedContent.GetUrl(culture) // fixme ∞ loop. + ? umbracoContext.PublishedRequest.PublishedContent.GetUrl(culture) : null; }