summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorNathaniel <catch@35733.no-reply.drupal.org>2011-09-28 12:49:07 +0900
committerNathaniel <catch@35733.no-reply.drupal.org>2011-09-28 12:49:07 +0900
commit4ff2d94d8fc8293c36c3eaa1b41766b9c4b815f7 (patch)
tree26599f9c054291988b13255d0730727588d7e760
parentb93f2bcd94997c7ee4adc25bf058a3debea13190 (diff)
downloaddrupal-4ff2d94d8fc8293c36c3eaa1b41766b9c4b815f7.tar.gz
drupal-4ff2d94d8fc8293c36c3eaa1b41766b9c4b815f7.zip
Issue #1110650 by oriol_e9g, JohnAlbin, linclark, dixon_: Fixed comment-by-anonymous class never appears.
-rw-r--r--modules/comment/comment.module2
-rw-r--r--modules/comment/comment.test9
2 files changed, 10 insertions, 1 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 8100989d48e..4a5cbd9d156 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -2292,7 +2292,7 @@ function template_preprocess_comment(&$variables) {
$variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'comment-unpublished' : 'comment-published';
}
// Gather comment classes.
- if ($comment->uid === 0) {
+ if ($comment->uid == 0) {
$variables['classes_array'][] = 'comment-by-anonymous';
}
else {
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index e5cae5e0212..3b83342f41f 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -331,6 +331,8 @@ class CommentInterfaceTest extends CommentHelperCase {
$comment = $this->postComment($this->node, $comment_text);
$comment_loaded = comment_load($comment->id);
$this->assertTrue($this->commentExists($comment), t('Comment found.'));
+ $by_viewer_class = $this->xpath('//a[@id=:comment_id]/following-sibling::div[1][contains(@class, "comment-by-viewer")]', array(':comment_id' => 'comment-' . $comment->id));
+ $this->assertTrue(!empty($by_viewer_class), t('HTML class for comments by viewer found.'));
// Set comments to have subject and preview to required.
$this->drupalLogout();
@@ -417,6 +419,11 @@ class CommentInterfaceTest extends CommentHelperCase {
$this->assertTrue($this->commentExists($reply, TRUE), t('Page two exists. %s'));
$this->setCommentsPerPage(50);
+ // Create comment #5 to assert HTML class.
+ $comment = $this->postComment($this->node, $this->randomName(), $this->randomName());
+ $by_node_author_class = $this->xpath('//a[@id=:comment_id]/following-sibling::div[1][contains(@class, "comment-by-node-author")]', array(':comment_id' => 'comment-' . $comment->id));
+ $this->assertTrue(!empty($by_node_author_class), t('HTML class for node author found.'));
+
// Attempt to post to node with comments disabled.
$this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_HIDDEN));
$this->assertTrue($this->node, t('Article node created.'));
@@ -963,6 +970,8 @@ class CommentAnonymous extends CommentHelperCase {
// Post anonymous comment without contact info.
$anonymous_comment1 = $this->postComment($this->node, $this->randomName(), $this->randomName());
$this->assertTrue($this->commentExists($anonymous_comment1), t('Anonymous comment without contact info found.'));
+ $anonymous_class = $this->xpath('//a[@id=:comment_id]/following-sibling::div[1][contains(@class, "comment-by-anonymous")]', array(':comment_id' => 'comment-' . $anonymous_comment1->id));
+ $this->assertTrue(!empty($anonymous_class), t('HTML class for anonymous comments found.'));
// Allow contact info.
$this->drupalLogin($this->admin_user);