From 68866e9faf5ad7cad911fe67697bb04d0d99d5cb Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Fri, 4 Oct 2019 11:17:36 +0100
Subject: [PATCH] Adding a constant for the new field name

---
 src/Umbraco.Examine/MediaValueSetBuilder.cs           | 2 +-
 src/Umbraco.Examine/UmbracoExamineIndex.cs            | 1 +
 src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs | 4 ++--
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Examine/MediaValueSetBuilder.cs b/src/Umbraco.Examine/MediaValueSetBuilder.cs
index e6e7d620d9..db8299dd6d 100644
--- a/src/Umbraco.Examine/MediaValueSetBuilder.cs
+++ b/src/Umbraco.Examine/MediaValueSetBuilder.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Examine
                     {"path", m.Path?.Yield() ?? Enumerable.Empty<string>()},
                     {"nodeType", m.ContentType.Id.ToString().Yield() },
                     {"creatorName", (m.GetCreatorProfile(_userService)?.Name ?? "??").Yield()},
-                    {"__umbracoFile", new object[] {umbracoFile}}
+                    {UmbracoExamineIndex.UmbracoFileFieldName, new object[] {umbracoFile}}
                 };
 
                 foreach (var property in m.Properties)
diff --git a/src/Umbraco.Examine/UmbracoExamineIndex.cs b/src/Umbraco.Examine/UmbracoExamineIndex.cs
index 24952050da..916ef95d1c 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndex.cs
@@ -32,6 +32,7 @@ namespace Umbraco.Examine
         /// </summary>
         public const string IndexPathFieldName = SpecialFieldPrefix + "Path";
         public const string NodeKeyFieldName = SpecialFieldPrefix + "Key";
+        public const string UmbracoFileFieldName = SpecialFieldPrefix + "umbracoFile";
         public const string IconFieldName = SpecialFieldPrefix + "Icon";
         public const string PublishedFieldName = SpecialFieldPrefix + "Published";
 
diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
index 7e88590552..5219ab8b54 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
@@ -180,9 +180,9 @@ namespace Umbraco.Web.Models.Mapping
 
             target.Name = source.Values.ContainsKey("nodeName") ? source.Values["nodeName"] : "[no name]";
 
-            if (source.Values.ContainsKey("__umbracoFile"))
+            if (source.Values.ContainsKey(UmbracoExamineIndex.UmbracoFileFieldName))
             {
-                var umbracoFile = source.Values["__umbracoFile"];
+                var umbracoFile = source.Values[UmbracoExamineIndex.UmbracoFileFieldName];
                 if (umbracoFile != null)
                 {
                     target.Name = $"{target.Name} ({umbracoFile})";
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 23f13c2f33..84889e76c0 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Search
                     break;
                 case UmbracoEntityTypes.Media:
                     type = "media";
-                    fields = new[] { "__umbracoFile" };
+                    fields = new[] { UmbracoExamineIndex.UmbracoFileFieldName };
                     var allMediaStartNodes = _umbracoContext.Security.CurrentUser.CalculateMediaStartNodeIds(_entityService);
                     AppendPath(sb, UmbracoObjectTypes.Media, allMediaStartNodes, searchFrom, ignoreUserStartNodes, _entityService);
                     break;