Merge branch origin/temp8 into temp8-di2690

2018-12-21 10:58:38 +01:00
parent 115b0cd2aa b0eb0d1205
commit bb9846a6ca
126 changed files with 1327 additions and 978 deletions
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -24,6 +24,8 @@ using System.Threading.Tasks;
 using Examine.LuceneEngine.Directories;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Strings;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Trees;

 namespace Umbraco.Web.Search
 {
@@ -51,6 +53,7 @@ namespace Umbraco.Web.Search
        // but greater that SafeXmlReaderWriter priority which is 60
        private const int EnlistPriority = 80;

+
        public override void Compose(Composition composition)
        {
            base.Compose(composition);