yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes ISearchableTree lifetime registration, fixes routing that clears required query strings, fixes lucene search string, gets URls in search results working with default lang/variants

Browse Source
This commit is contained in:
Shannon
2018-12-11 15:42:32 +11:00
parent 9b52fa215f
commit 5148f34b32
11 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/PublishedContentQuery.cs
View File

@@ -234,7 +234,7 @@ namespace Umbraco.Web
if (_query != null) return _query.Search(skip, take, out totalRecords, term, useWildCards, indexName);
indexName = string.IsNullOrEmpty(indexName)
? Constants.Examine.ExternalIndexer
? Constants.UmbracoIndexes.ExternalIndexName
: indexName;
if (!ExamineManager.Instance.TryGetIndex(indexName, out var index))
@@ -264,8 +264,8 @@ namespace Umbraco.Web
//fixme: inject IExamineManager
if (searcher == null)
{
if (!ExamineManager.Instance.TryGetIndex(Constants.Examine.ExternalIndexer, out var index))
throw new InvalidOperationException($"No index found by name {Constants.Examine.ExternalIndexer}");
if (!ExamineManager.Instance.TryGetIndex(Constants.UmbracoIndexes.ExternalIndexName, out var index))
throw new InvalidOperationException($"No index found by name {Constants.UmbracoIndexes.ExternalIndexName}");
searcher = index.GetSearcher();
}