tonyair
/
silverstripe-comments
mirror of https://github.com/silverstripe/silverstripe-comments
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX: Take account of spam/moderation status when enabling replies to a comment

This commit is contained in:
Gordon Anderson 2016-02-13 21:22:07 +07:00
parent 5ec6724393
commit 551841fbda
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/model/Comment.php
View File

@ -665,8 +665,9 @@ class Comment extends DataObject {
}
// Check if depth is limited
$maxLevel = $this->getOption('nested_depth');
return !$maxLevel || $this->Depth < $maxLevel;
$maxLevel = $this->getOption('nested_depth');
$notSpam = ($this->SpamClass() == 'notspam');
return $notSpam && (!$maxLevel || $this->Depth < $maxLevel);
}
/**

19
tests/CommentsTest.php
View File

@ -966,6 +966,25 @@ class CommentsTest extends FunctionalTest {
$comment->Depth = 4;
$this->assertFalse($comment->getRepliesEnabled());
// 0 indicates no limit for nested_depth
Config::inst()->update('CommentableItem', 'comments', array(
'nested_comments' => true,
'nested_depth' => 0
));
$comment->Depth = 234;
$this->assertTrue($comment->getRepliesEnabled());
$comment->markUnapproved();
$this->assertFalse($comment->getRepliesEnabled());
$comment->markSpam();
$this->assertFalse($comment->getRepliesEnabled());
$comment->markApproved();
$this->assertTrue($comment->getRepliesEnabled());
}
public function testAllReplies() {