lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 02:44:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix NullReferenceException in comments module

Browse Source 
The comments service didn't expect working with unpublished content items.

Work Item: 17070

--HG--
branch : 1.x
This commit is contained in:
Renaud Paquay
2011-01-07 21:46:22 -08:00
parent 9a4c5d6c52
commit 27f7921356
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
View File

@@ -55,14 +55,17 @@ namespace Orchard.Comments.Services {
}
public ContentItemMetadata GetDisplayForCommentedContent(int id) {
var content = _orchardServices.ContentManager.Get(id);
var content = GetCommentedContent(id);
if (content == null)
return null;
return _orchardServices.ContentManager.GetItemMetadata(content);
}
public ContentItem GetCommentedContent(int id) {
return _orchardServices.ContentManager.Get(id);
var result = _orchardServices.ContentManager.Get(id, VersionOptions.Published);
if (result == null)
result = _orchardServices.ContentManager.Get(id, VersionOptions.Draft);
return result;
}
public CommentPart CreateComment(CreateCommentContext context, bool moderateComments) {
@@ -119,15 +122,15 @@ namespace Orchard.Comments.Services {
}
public bool CommentsDisabledForCommentedContent(int id) {
return !_orchardServices.ContentManager.Get<CommentsPart>(id).CommentsActive;
return !_orchardServices.ContentManager.Get<CommentsPart>(id, VersionOptions.Latest).CommentsActive;
}
public void DisableCommentsForCommentedContent(int id) {
_orchardServices.ContentManager.Get<CommentsPart>(id).CommentsActive = false;
_orchardServices.ContentManager.Get<CommentsPart>(id, VersionOptions.Latest).CommentsActive = false;
}
public void EnableCommentsForCommentedContent(int id) {
_orchardServices.ContentManager.Get<CommentsPart>(id).CommentsActive = true;
_orchardServices.ContentManager.Get<CommentsPart>(id, VersionOptions.Latest).CommentsActive = true;
}
}
}