An optional value of Default　display　mode can be wrong.

comment_default_mode = 0  Flat list - collapsed
comment_default_mode = 1  Flat list - expanded
comment_default_mode = 2  Threaded list - collapsed
comment_default_mode = 3  Threaded list - expanded

Comment　controls is not reflected

@@ -888,7 +888,7 @@ function comment_render($node, $cid = 0)
       // is global and defined in pager.inc.
       $output .= theme('pager', NULL, $comments_per_page, 0, array('comments_per_page' => $comments_per_page));
 
-      if (db_num_rows($result) && (variable_get('comment_controls', 3) == 1 || variable_get('comment_controls', 3) == 3)) {
+      if (db_num_rows($result) && (variable_get('comment_controls', 3) == 1 || variable_get('comment_controls', 3) == 2)) {
         $output .= comment_controls($mode, $order, $comments_per_page, $nid, 'bottom');
       }
     }
CommentFileSizeAuthor
#7 comment_defines_2.patch3.35 KBasimmonds
#6 comment_defines_1.patch1.67 KBasimmonds
#4 comment_defines_0.patch18.67 KBchx
#2 comment_defines.patch18.67 KBasimmonds
comment_3.diff2.63 KBp_____n

Comments

dries’s picture

dries commented

It would be a good idea to introduce some defines.

asimmonds’s picture

asimmonds commented
Assigned: Unassigned » asimmonds
Priority: Critical » Normal
Status: Active » Needs review
StatusFileSize
new comment_defines.patch18.67 KB

Patch to change all the 'integer' constants used in comment.module to defines, also fixing this bug and http://drupal.org/node/35771

p_____n’s picture

p_____n commented

the same as a problem of http://drupal.org/node/35771

It moves without the place problem that I adapt myself, and inspected a patch.

Thank you

chx’s picture

chx commented
Assigned: asimmonds » chx
Status: Needs review » Reviewed & tested by the community
StatusFileSize
new comment_defines_0.patch18.67 KB

This is partially my bad, therefore I shoulder this patch from now on. In the early stages of form API conversion, there was a problem with zero values, later this was corrected and I tried to redo comment but it became the sorry mess it is now. Thanks for the patch. I changed only the values of defines so it's zero based and did some testing.

dries’s picture

dries commented
Status: Reviewed & tested by the community » Fixed

Committed to HEAD. Thanks.

asimmonds’s picture

asimmonds commented
Status: Fixed » Needs review
StatusFileSize
new comment_defines_1.patch1.67 KB

Patch for some define substitutions that were missed. Hope that's *all* of them now.

asimmonds’s picture

asimmonds commented
StatusFileSize
new comment_defines_2.patch3.35 KB

Added some defines for the comment preview optional/required toggle (I'm probably going overboard with the defs now...)

dries’s picture

dries commented
Status: Needs review » Fixed

Great. Committed to HEAD. Thanks.

Anonymous’s picture

(not verified) commented
Status: Fixed » Closed (fixed)