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

Fix post-merge issues

Browse Source
This commit is contained in:
Stephan
2017-03-30 09:58:27 +02:00
parent c5f388f6bc
commit f2fb275b34
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
View File

@@ -287,7 +287,7 @@ AND umbracoNode.id <> @id",
/// <returns>PreValue as a string</returns>
public string GetPreValueAsString(int preValueId)
{
var collections = GlobalCache.RuntimeCache.GetCacheItemsByKeySearch<PreValueCollection>(CacheKeys.DataTypePreValuesCacheKey + "_");
var collections = IsolatedCache.GetCacheItemsByKeySearch<PreValueCollection>(CacheKeys.DataTypePreValuesCacheKey + "_");
var preValue = collections.SelectMany(x => x.FormatAsDictionary().Values).FirstOrDefault(x => x.Id == preValueId);
if (preValue != null)
@@ -437,7 +437,7 @@ AND umbracoNode.id <> @id",
private PreValueCollection GetCachedPreValueCollection(int datetypeId)
{
var key = GetPrefixedCacheKey(datetypeId);
return GlobalCache.RuntimeCache.GetCacheItem<PreValueCollection>(key, () =>
return IsolatedCache.GetCacheItem<PreValueCollection>(key, () =>
{
var dtos = Database.Fetch<DataTypePreValueDto>("WHERE datatypeNodeId = @Id", new { Id = datetypeId });
var list = dtos.Select(x => new Tuple<PreValue, string, int>(new PreValue(x.Id, x.Value, x.SortOrder), x.Alias, x.SortOrder)).ToList();