lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Fixes 7246] Added null checks for version ids

Browse Source 
Fixes #7246
This commit is contained in:
ViRuSTriNiTy
2016-10-06 21:41:45 +02:00
committed by Sébastien Ros
parent 7171244044
commit 2a8d091e07
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard/ContentManagement/DefaultContentManager.cs
View File

@@ -277,7 +277,8 @@ namespace Orchard.ContentManagement {
return _contentItemVersionRepository return _contentItemVersionRepository
.Fetch(x => x.ContentItemRecord.Id == id) .Fetch(x => x.ContentItemRecord.Id == id)
.OrderBy(x => x.Number) .OrderBy(x => x.Number)
.Select(x => Get(x.Id, VersionOptions.VersionRecord(x.Id))); .Select(x => Get(x.Id, VersionOptions.VersionRecord(x.Id)))
.Where(ci => ci != null);
} }
public IEnumerable<T> GetMany<T>(IEnumerable<int> ids, VersionOptions options, QueryHints hints) where T : class, IContent { public IEnumerable<T> GetMany<T>(IEnumerable<int> ids, VersionOptions options, QueryHints hints) where T : class, IContent {
@@ -301,6 +302,7 @@ namespace Orchard.ContentManagement {
var itemsById = contentItemVersionRecords var itemsById = contentItemVersionRecords
.Select(r => Get(r.ContentItemRecord.Id, options.IsDraftRequired ? options : VersionOptions.VersionRecord(r.Id))) .Select(r => Get(r.ContentItemRecord.Id, options.IsDraftRequired ? options : VersionOptions.VersionRecord(r.Id)))
.Where(ci => ci != null)
.GroupBy(ci => ci.Id) .GroupBy(ci => ci.Id)
.ToDictionary(g => g.Key); .ToDictionary(g => g.Key);
@@ -317,6 +319,7 @@ namespace Orchard.ContentManagement {
var itemsById = contentItemVersionRecords var itemsById = contentItemVersionRecords
.Select(r => Get(r.ContentItemRecord.Id, VersionOptions.VersionRecord(r.Id))) .Select(r => Get(r.ContentItemRecord.Id, VersionOptions.VersionRecord(r.Id)))
.Where(ci => ci != null)
.GroupBy(ci => ci.VersionRecord.Id) .GroupBy(ci => ci.VersionRecord.Id)
.ToDictionary(g => g.Key); .ToDictionary(g => g.Key);